ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/clip_unix.cpp
(Generate patch)

Comparing BasiliskII/src/Unix/clip_unix.cpp (file contents):
Revision 1.3 by cebix, 2000-05-16T17:11:39Z vs.
Revision 1.8 by gbeauche, 2004-06-23T14:30:48Z

# Line 1 | Line 1
1   /*
2   *  clip_unix.cpp - Clipboard handling, Unix implementation
3   *
4 < *  Basilisk II (C) 1997-2000 Christian Bauer
4 > *  Basilisk II (C) 1997-2004 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 19 | Line 19
19   */
20  
21   #include "sysdeps.h"
22
23 #include <X11/Xlib.h>
24
22   #include "clip.h"
23 + #include "macos_util.h"
24   #include "prefs.h"
25  
26   #define DEBUG 0
27   #include "debug.h"
28  
29  
30 < // From main_unix.cpp
30 > // From video_x.cpp
31 > #ifndef USE_SDL_VIDEO
32 > #include <X11/Xlib.h>
33   extern Display *x_display;
34 + #endif
35  
36  
37   // Conversion tables
# Line 86 | Line 87 | void PutScrap(uint32 type, void *scrap,
87          if (length <= 0)
88                  return;
89  
90 + #ifndef USE_SDL_VIDEO
91          switch (type) {
92 <                case 'TEXT':
92 >                case FOURCC('T','E','X','T'):
93                          D(bug(" clipping TEXT\n"));
94  
95                          // Convert text from Mac charset to ISO-Latin1
# Line 109 | Line 111 | void PutScrap(uint32 type, void *scrap,
111                          delete[] buf;
112                          break;
113          }
114 + #endif
115   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines