diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-11-11 08:38:36 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-11-11 08:38:36 +0000 |
| commit | 3cf2305b5c326ef7d15e7eaf37302a6853bddabc (patch) | |
| tree | 609fde6986164f92ac80e1bb527cd31f9b34aa5f /src | |
| parent | db8d9893eb37443d27bc6fe96b01adf5013c46c6 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_win32.cxx | 10 | ||||
| -rw-r--r-- | src/fl_dnd_win32.cxx | 11 |
2 files changed, 1 insertions, 20 deletions
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$". |