mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIN32 fixes for BC++.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2168 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-05-01 20:05:19 +00:00
parent 11f56a0dc0
commit c0670cdc55
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Fl_File_Browser.cxx
View File

@ -1,5 +1,5 @@
// //
// "$Id: Fl_File_Browser.cxx,v 1.1.2.12 2002/04/30 12:11:25 easysw Exp $" // "$Id: Fl_File_Browser.cxx,v 1.1.2.13 2002/05/01 20:05:19 easysw Exp $"
// //
// Fl_File_Browser routines. // Fl_File_Browser routines.
// //
@ -49,6 +49,9 @@
#elif defined(WIN32) #elif defined(WIN32)
# include <windows.h> # include <windows.h>
# include <direct.h> # include <direct.h>
# ifdef DIRECTORY
# undef DIRECTORY
# endif // DIRECTORY
#endif // __CYGWIN__ #endif // __CYGWIN__
#ifdef __EMX__ #ifdef __EMX__
@ -623,5 +626,5 @@ Fl_File_Browser::filter(const char *pattern) // I - Pattern string
// //
// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.12 2002/04/30 12:11:25 easysw Exp $". // End of "$Id: Fl_File_Browser.cxx,v 1.1.2.13 2002/05/01 20:05:19 easysw Exp $".
// //

10
src/Fl_win32.cxx
View File

@ -1,5 +1,5 @@
// //
// "$Id: Fl_win32.cxx,v 1.33.2.37.2.30 2002/05/01 19:44:01 easysw Exp $" // "$Id: Fl_win32.cxx,v 1.33.2.37.2.31 2002/05/01 20:05:19 easysw Exp $"
// //
// WIN32-specific code for the Fast Light Tool Kit (FLTK). // WIN32-specific code for the Fast Light Tool Kit (FLTK).
// //
@ -123,9 +123,7 @@ static fd_set fdsets[3];
#define POLLOUT 4 #define POLLOUT 4
#define POLLERR 8 #define POLLERR 8
class FLDropTarget : public IDropTarget; extern IDropTarget *flIDropTarget;
extern FLDropTarget flDropTarget;
static int nfds = 0; static int nfds = 0;
static int fd_array_size = 0; static int fd_array_size = 0;
@ -1050,7 +1048,7 @@ Fl_X* Fl_X::make(Fl_Window* w) {
static char oleInitialized = 0; static char oleInitialized = 0;
if (!oleInitialized) { OleInitialize(0L); oleInitialized=1; } if (!oleInitialized) { OleInitialize(0L); oleInitialized=1; }
RegisterDragDrop(x->xid, (IDropTarget*)&flDropTarget); RegisterDragDrop(x->xid, flIDropTarget);
#endif // !__GNUC__ || __GNUC__ >= 3 #endif // !__GNUC__ || __GNUC__ >= 3
if (w->modal()) {Fl::modal_ = w; fl_fix_focus();} if (w->modal()) {Fl::modal_ = w; fl_fix_focus();}
@ -1183,5 +1181,5 @@ void Fl_Window::make_current() {
} }
// //
// End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.30 2002/05/01 19:44:01 easysw Exp $". // End of "$Id: Fl_win32.cxx,v 1.33.2.37.2.31 2002/05/01 20:05:19 easysw Exp $".
// //

6
src/fl_dnd_win32.cxx
View File

@ -1,5 +1,5 @@
// //
// "$Id: fl_dnd_win32.cxx,v 1.5.2.7 2002/04/11 11:52:42 easysw Exp $" // "$Id: fl_dnd_win32.cxx,v 1.5.2.8 2002/05/01 20:05:19 easysw Exp $"
// //
// Drag & Drop code for the Fast Light Tool Kit (FLTK). // Drag & Drop code for the Fast Light Tool Kit (FLTK).
// //
@ -209,6 +209,8 @@ public:
} }
} flDropTarget; } flDropTarget;
IDropTarget *flIDropTarget = &flDropTarget;
/** /**
* this class is needed to allow FLTK apps to be a DnD source * this class is needed to allow FLTK apps to be a DnD source
*/ */
@ -349,5 +351,5 @@ int Fl::dnd()
// //
// End of "$Id: fl_dnd_win32.cxx,v 1.5.2.7 2002/04/11 11:52:42 easysw Exp $". // End of "$Id: fl_dnd_win32.cxx,v 1.5.2.8 2002/05/01 20:05:19 easysw Exp $".
// //