diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-01 20:05:19 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-01 20:05:19 +0000 |
| commit | c0670cdc55ecd3908a3e45eee16806bd417dbf59 (patch) | |
| tree | 9b53653876685d11c3801c64926224be80d82eb0 /src | |
| parent | 11f56a0dc0a5490af74d0a7483664ce40b3df221 (diff) | |
WIN32 fixes for BC++.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2168 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_File_Browser.cxx | 7 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 10 | ||||
| -rw-r--r-- | src/fl_dnd_win32.cxx | 6 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx index dc1441853..c5b7835a7 100644 --- a/src/Fl_File_Browser.cxx +++ b/src/Fl_File_Browser.cxx @@ -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. // @@ -49,6 +49,9 @@ #elif defined(WIN32) # include <windows.h> # include <direct.h> +# ifdef DIRECTORY +# undef DIRECTORY +# endif // DIRECTORY #endif // __CYGWIN__ #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 $". // diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 6c9f21fe3..00836041e 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -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). // @@ -123,9 +123,7 @@ static fd_set fdsets[3]; #define POLLOUT 4 #define POLLERR 8 -class FLDropTarget : public IDropTarget; - -extern FLDropTarget flDropTarget; +extern IDropTarget *flIDropTarget; static int nfds = 0; static int fd_array_size = 0; @@ -1050,7 +1048,7 @@ Fl_X* Fl_X::make(Fl_Window* w) { static char oleInitialized = 0; if (!oleInitialized) { OleInitialize(0L); oleInitialized=1; } - RegisterDragDrop(x->xid, (IDropTarget*)&flDropTarget); + RegisterDragDrop(x->xid, flIDropTarget); #endif // !__GNUC__ || __GNUC__ >= 3 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 $". // diff --git a/src/fl_dnd_win32.cxx b/src/fl_dnd_win32.cxx index 7a5a53759..e4bfa50f4 100644 --- a/src/fl_dnd_win32.cxx +++ b/src/fl_dnd_win32.cxx @@ -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). // @@ -209,6 +209,8 @@ public: } } flDropTarget; +IDropTarget *flIDropTarget = &flDropTarget; + /** * 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 $". // |