diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-09 20:36:28 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-09 20:36:28 +0000 |
| commit | 77a3b80dff7dbd282c240bfb329f0a93c9ada4aa (patch) | |
| tree | e5ba98033ee216cad0b70ce83a9a6bb2f454b74e | |
| parent | 921f66e3e641a290f375fd1b46bc2a5bbe601dbd (diff) | |
OK, back out -fvtable-thunks and add conditional compile for WIN32
DnD code for Cygwin...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2062 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | src/fl_dnd_win32.cxx | 18 |
3 files changed, 20 insertions, 10 deletions
@@ -1,7 +1,7 @@ CHANGES IN FLTK 1.1.0b13 - - Cygwin needs "-fvtable-thunks" to compile the new - WIN32 drag-n-drop code. + - Cygwin can only compile the new WIN32 drag-n-drop code + using GCC 3.x. - Tooltips now appear for inactive and output widgets. - Tooltips no longer steal keyboard events other than ESCape. diff --git a/configure.in b/configure.in index 6884e3fb1..e047df9ab 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl -*- sh -*- dnl the "configure" script is made from this by running GNU "autoconf" dnl -dnl "$Id: configure.in,v 1.33.2.31.2.57 2002/04/09 18:18:25 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.58 2002/04/09 20:36:27 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -327,8 +327,8 @@ case $uname in CFLAGS="-mwindows -DWIN32 $CFLAGS" CXXFLAGS="-mwindows -DWIN32 $CXXFLAGS" LDFLAGS="-mwindows $LDFLAGS" - LIBS="$LIBS -lcomctl32 -lwsock32" - OPTIM="$OPTIM -fvtable-thunks" + LIBS="$LIBS -lole32 -luuid -lcomctl32 -lwsock32" + OPTIM="$OPTIM" if test x$enable_gl != xno; then AC_CHECK_HEADER(GL/gl.h, @@ -707,5 +707,5 @@ dnl Make sure the fltk-config script is executable... chmod +x fltk-config dnl -dnl End of "$Id: configure.in,v 1.33.2.31.2.57 2002/04/09 18:18:25 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.58 2002/04/09 20:36:27 easysw Exp $". dnl diff --git a/src/fl_dnd_win32.cxx b/src/fl_dnd_win32.cxx index d46e1fe6a..e510e7dfa 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.4 2002/03/25 19:17:05 easysw Exp $" +// "$Id: fl_dnd_win32.cxx,v 1.5.2.5 2002/04/09 20:36:28 easysw Exp $" // // Drag & Drop code for the Fast Light Tool Kit (FLTK). // @@ -53,6 +53,9 @@ extern char fl_i_own_selection[2]; Fl_Window *fl_dnd_target_window = 0; +// All of the following code requires GCC 3.x or a non-GNU compiler... +#if !defined(__GNUC__) || __GNUC__ >= 3 + /** * subclass the IDropTarget to receive data from DnD operations */ @@ -333,11 +336,18 @@ int Fl::dnd() w->handle( FL_RELEASE ); Fl::pushed( 0 ); } - if ( ret==DRAGDROP_S_DROP ) return true; // or DD_S_CANCEL - return false; + if ( ret==DRAGDROP_S_DROP ) return 1; // or DD_S_CANCEL + return 0; +} +#else +int Fl::dnd() +{ + // Always indicate DnD failed when using GCC < 3... + return 1; } +#endif // !__GNUC__ || __GNUC__ >= 3 // -// End of "$Id: fl_dnd_win32.cxx,v 1.5.2.4 2002/03/25 19:17:05 easysw Exp $". +// End of "$Id: fl_dnd_win32.cxx,v 1.5.2.5 2002/04/09 20:36:28 easysw Exp $". // |