Author: AlbrechtS
Date: 2010-11-11 00:38:36 -0800 (Thu, 11 Nov 2010)
New Revision: 7814
Log:
removed support for gcc 2.x (or older), as discussed in fltk.development
Modified:
branches/branch-1.3/CHANGES
branches/branch-1.3/FL/Fl_Export.H
branches/branch-1.3/FL/fl_ask.H
branches/branch-1.3/src/Fl_win32.cxx
branches/branch-1.3/src/fl_dnd_win32.cxx
Modified: branches/branch-1.3/CHANGES
===================================================================
--- branches/branch-1.3/CHANGES 2010-11-10 21:18:17 UTC (rev 7813)
+++ branches/branch-1.3/CHANGES 2010-11-11 08:38:36 UTC (rev 7814)
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.3.0
+ - removed support for gcc 2.x (or older)
- Fixed fltk-config to give --libs on one line (STR #2408)
- Fixed tab key navigation to inactive widgets (STR #2420)
- Fixed outside label redraw damage areas (STR #2436)
Modified: branches/branch-1.3/FL/Fl_Export.H
===================================================================
--- branches/branch-1.3/FL/Fl_Export.H 2010-11-10 21:18:17 UTC (rev 7813)
+++ branches/branch-1.3/FL/Fl_Export.H 2010-11-11 08:38:36 UTC (rev 7814)
@@ -32,7 +32,7 @@
* The following is only used when building DLLs under WIN32...
*/
-# if defined(FL_DLL) && (defined(_MSC_VER) || defined(__MWERKS__) ||
defined(__BORLANDC__) || __GNUC__ >= 3)
+# if defined(FL_DLL) && ( defined(_MSC_VER) || defined(__MWERKS__) ||
defined(__BORLANDC__) || defined(__GNUC__) )
# ifdef FL_LIBRARY
# define FL_EXPORT __declspec(dllexport)
# else
Modified: branches/branch-1.3/FL/fl_ask.H
===================================================================
--- branches/branch-1.3/FL/fl_ask.H 2010-11-10 21:18:17 UTC (rev 7813)
+++ branches/branch-1.3/FL/fl_ask.H 2010-11-11 08:38:36 UTC (rev 7814)
@@ -43,9 +43,6 @@
# ifdef __GNUC__
# define __fl_attr(x) __attribute__ (x)
-# if __GNUC__ < 3
-# define __deprecated__
-# endif // __GNUC__ < 3
# else
# define __fl_attr(x)
# endif // __GNUC__
Modified: branches/branch-1.3/src/Fl_win32.cxx
===================================================================
--- branches/branch-1.3/src/Fl_win32.cxx 2010-11-10 21:18:17 UTC (rev
7813)
+++ branches/branch-1.3/src/Fl_win32.cxx 2010-11-11 08:38:36 UTC (rev
7814)
@@ -61,15 +61,12 @@
#include <winuser.h>
#include <commctrl.h>
-#if defined(__GNUC__) && __GNUC__ >= 3
+#if defined(__GNUC__)
# include <wchar.h>
#endif
-// The following include files require GCC 3.x or a non-GNU compiler...
-#if !defined(__GNUC__) || __GNUC__ >= 3
# include <ole2.h>
# include <shellapi.h>
-#endif // !__GNUC__ || __GNUC__ >= 3
#include "aimm.h"
@@ -245,9 +242,7 @@
static int maxfd = 0;
static fd_set fdsets[3];
-#if !defined(__GNUC__) || __GNUC__ >= 3
extern IDropTarget *flIDropTarget;
-#endif // !__GNUC__ || __GNUC__ >= 3
static int nfds = 0;
static int fd_array_size = 0;
@@ -1551,8 +1546,6 @@
ShowWindow(x->xid, !showit ? SW_SHOWMINNOACTIVE :
(Fl::grab() || (style & WS_POPUP)) ? SW_SHOWNOACTIVATE :
SW_SHOWNORMAL);
- // Drag-n-drop requires GCC 3.x or a non-GNU compiler...
-#if !defined(__GNUC__) || __GNUC__ >= 3
// Register all windows for potential drag'n'drop operations
fl_OleInitialize();
RegisterDragDrop(x->xid, flIDropTarget);
@@ -1564,7 +1557,6 @@
fl_aimm->Activate(TRUE);
}
}
-#endif // !__GNUC__ || __GNUC__ >= 3
if (w->modal()) {Fl::modal_ = w; fl_fix_focus();}
return x;
Modified: branches/branch-1.3/src/fl_dnd_win32.cxx
===================================================================
--- branches/branch-1.3/src/fl_dnd_win32.cxx 2010-11-10 21:18:17 UTC (rev
7813)
+++ branches/branch-1.3/src/fl_dnd_win32.cxx 2010-11-11 08:38:36 UTC (rev
7814)
@@ -54,9 +54,6 @@
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
-
#include <ole2.h>
#include <shellapi.h>
#include <shlobj.h>
@@ -519,15 +516,7 @@
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$".
//
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
