From 3cf2305b5c326ef7d15e7eaf37302a6853bddabc Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Thu, 11 Nov 2010 08:38:36 +0000
Subject: removed support for gcc 2.x (or older), as discussed in
 fltk.development

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7814 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CHANGES              |  1 +
 FL/Fl_Export.H       |  2 +-
 FL/fl_ask.H          |  3 ---
 src/Fl_win32.cxx     | 10 +---------
 src/fl_dnd_win32.cxx | 11 -----------
 5 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4f9ac05ce..95420c832 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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)
diff --git a/FL/Fl_Export.H b/FL/Fl_Export.H
index 950421129..6bd178e17 100644
--- a/FL/Fl_Export.H
+++ b/FL/Fl_Export.H
@@ -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
diff --git a/FL/fl_ask.H b/FL/fl_ask.H
index 844dbb9eb..844bdaabd 100644
--- a/FL/fl_ask.H
+++ b/FL/fl_ask.H
@@ -43,9 +43,6 @@ enum {
 
 #  ifdef __GNUC__
 #    define __fl_attr(x) __attribute__ (x)
-#    if __GNUC__ < 3
-#      define __deprecated__
-#    endif // __GNUC__ < 3
 #  else
 #    define __fl_attr(x)
 #  endif // __GNUC__
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 53f65eebb..a69fb6c79 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -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 Fl_Window *track_mouse_win=0;	// current TrackMouseEvent() window
 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 @@ Fl_X* Fl_X::make(Fl_Window* w) {
   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_X* Fl_X::make(Fl_Window* w) {
       fl_aimm->Activate(TRUE);
     }
   }
-#endif // !__GNUC__ || __GNUC__ >= 3
 
   if (w->modal()) {Fl::modal_ = w; fl_fix_focus();}
   return x;
diff --git a/src/fl_dnd_win32.cxx b/src/fl_dnd_win32.cxx
index 12caa280a..cf20365cb 100644
--- a/src/fl_dnd_win32.cxx
+++ b/src/fl_dnd_win32.cxx
@@ -54,9 +54,6 @@ extern unsigned int fl_codepage;
 
 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,14 +516,6 @@ int Fl::dnd()
   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$".
-- 
cgit v1.2.3