Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-01 06:14:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

OK, back out -fvtable-thunks and add conditional compile for WIN32

Browse Source 
DnD code for Cygwin...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2062 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2002-04-09 20:36:28 +00:00
parent 921f66e3e6
commit 77a3b80dff
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2 -2
View File
@@ -1,7 +1,7 @@
CHANGES IN FLTK 1.1.0b13 CHANGES IN FLTK 1.1.0b13
- Cygwin needs "-fvtable-thunks" to compile the new - Cygwin can only compile the new WIN32 drag-n-drop code
WIN32 drag-n-drop code. using GCC 3.x.
- Tooltips now appear for inactive and output widgets. - Tooltips now appear for inactive and output widgets.
- Tooltips no longer steal keyboard events other than - Tooltips no longer steal keyboard events other than
ESCape. ESCape.
configure.in
+4 -4
View File
@@ -1,7 +1,7 @@
dnl -*- sh -*- dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf" dnl the "configure" script is made from this by running GNU "autoconf"
dnl 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
dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl dnl
@@ -327,8 +327,8 @@ case $uname in
CFLAGS="-mwindows -DWIN32 $CFLAGS" CFLAGS="-mwindows -DWIN32 $CFLAGS"
CXXFLAGS="-mwindows -DWIN32 $CXXFLAGS" CXXFLAGS="-mwindows -DWIN32 $CXXFLAGS"
LDFLAGS="-mwindows $LDFLAGS" LDFLAGS="-mwindows $LDFLAGS"
LIBS="$LIBS -lcomctl32 -lwsock32" LIBS="$LIBS -lole32 -luuid -lcomctl32 -lwsock32"
OPTIM="$OPTIM -fvtable-thunks" OPTIM="$OPTIM"
if test x$enable_gl != xno; then if test x$enable_gl != xno; then
AC_CHECK_HEADER(GL/gl.h, AC_CHECK_HEADER(GL/gl.h,
@@ -707,5 +707,5 @@ dnl Make sure the fltk-config script is executable...
chmod +x fltk-config chmod +x fltk-config
dnl 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 dnl
src/fl_dnd_win32.cxx
+14 -4
View File
@@ -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). // 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; 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 * subclass the IDropTarget to receive data from DnD operations
*/ */
@@ -333,11 +336,18 @@ int Fl::dnd()
w->handle( FL_RELEASE ); w->handle( FL_RELEASE );
Fl::pushed( 0 ); Fl::pushed( 0 );
} }
if ( ret==DRAGDROP_S_DROP ) return true; // or DD_S_CANCEL if ( ret==DRAGDROP_S_DROP ) return 1; // or DD_S_CANCEL
return false; 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 $".
// //