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

Comparing BasiliskII/src/Windows/clip_windows.cpp (file contents):
Revision 1.1 by gbeauche, 2004-11-17T00:57:06Z vs.
Revision 1.6 by asvitkine, 2009-04-14T15:17:03Z

# Line 1 | Line 1
1   /*
2   *  clip_windows.cpp - Clipboard handling, Windows implementation
3   *
4 < *  Basilisk II (C) 1997-2004 Christian Bauer
4 > *  Basilisk II (C) 1997-2008 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 93 | Line 93 | struct ByteArray : public vector<uint8>
93   static void do_putscrap(uint32 type, void *scrap, int32 length);
94   static void do_getscrap(void **handle, uint32 type, int32 offset);
95  
96 < // The main window handle
97 < #ifdef USE_SDL_VIDEO
98 < #include <SDL_syswm.h>
99 < static HWND GetMainWindowHandle(void)
100 < {
101 <        SDL_SysWMinfo wmInfo;
102 <        wmInfo.version.major = SDL_MAJOR_VERSION;
103 <        wmInfo.version.minor = SDL_MINOR_VERSION;
104 <        wmInfo.version.patch = SDL_PATCHLEVEL;
105 <        return SDL_GetWMInfo(&wmInfo) ? wmInfo.window : NULL;
106 < }
107 < #endif
96 > // From main_windows.cpp
97 > extern HWND GetMainWindowHandle(void);
98  
99  
100   /*
# Line 241 | Line 231 | static void do_getscrap(void **handle, u
231                                                  for (int i = 0; i < length; i++) {
232                                                          uint8 c = data[i];
233                                                          if (c < 0x80) {
234 +                                                                if (c == 0)
235 +                                                                        break;
236                                                                  if (c == 13 && i < length - 1 && data[i + 1] == 10) {   // CR/LF -> CR
237                                                                          c = 13;
238                                                                          i++;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines