Include gtk1 headers for non-gtk2. I don't really like this CPP logic, or more exactly __WXGTK__ without __WXGTK20__

being GTK1, oh well. Might have missed some. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 03:27:34 +00:00
parent 8ef94bfc25
commit 1be7a35c5e
57 changed files with 177 additions and 57 deletions
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -118,8 +118,10 @@ private:
    #include "wx/msw/accel.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/accel.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/accel.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/accel.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/accel.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -555,8 +555,10 @@ protected:
        #include "wx/motif/app.h"
    #elif defined(__WXMGL__)
        #include "wx/mgl/app.h"
-    #elif defined(__WXGTK__)
+    #elif defined(__WXGTK20__)
        #include "wx/gtk/app.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk1/app.h"
    #elif defined(__WXX11__)
        #include "wx/x11/app.h"
    #elif defined(__WXMAC__)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -167,8 +167,10 @@ protected:
 #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)
 #include "wx/x11/bitmap.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/bitmap.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/bitmap.h"
 #elif defined(__WXX11__)
 #include "wx/x11/bitmap.h"
 #elif defined(__WXMGL__)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -105,8 +105,10 @@ inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
    #include "wx/msw/bmpbuttn.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/bmpbuttn.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/bmpbuttn.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/bmpbuttn.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/bmpbuttn.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -34,8 +34,10 @@ public:
    #include "wx/msw/brush.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
    #include "wx/x11/brush.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/brush.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/brush.h"
 #elif defined(__WXMGL__)
    #include "wx/mgl/brush.h"
 #elif defined(__WXMAC__)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -86,8 +86,10 @@ protected:
    #include "wx/msw/button.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/button.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/button.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/button.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/button.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -127,8 +127,10 @@ private:
    #include "wx/msw/checkbox.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/checkbox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/checkbox.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/checkbox.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/checkbox.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -46,8 +46,10 @@ public:
    #include "wx/msw/checklst.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/checklst.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/checklst.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/checklst.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/checklst.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -64,8 +64,10 @@ private:
    #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/choice.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/choice.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/choice.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -92,8 +92,10 @@ public:
    #include "wx/msw/clipbrd.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/clipbrd.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/clipbrd.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/clipbrd.h"
 #elif defined(__WXX11__)
    #include "wx/x11/clipbrd.h"
 #elif defined(__WXMGL__)
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -18,8 +18,10 @@
 #include "wx/msw/colour.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/colour.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/colour.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/colour.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/colour.h"
 #elif defined(__WXX11__)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -75,8 +75,10 @@ public:
    #include "wx/msw/combobox.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/combobox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/combobox.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/combobox.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/combobox.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -113,8 +113,10 @@ protected:
    #include "wx/msw/control.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/control.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/control.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/control.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/control.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -20,8 +20,10 @@
    #include "wx/msw/cursor.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/cursor.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/cursor.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/cursor.h"
 #elif defined(__WXX11__)
    #include "wx/x11/cursor.h"
 #elif defined(__WXMGL__)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -76,8 +76,10 @@ public:
    #include "wx/msw/ole/dataform.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/dataform.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/dataform.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/dataform.h"
 #elif defined(__WXX11__)
    #include "wx/x11/dataform.h"
 #elif defined(__WXMAC__)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -804,8 +804,10 @@ private:
    #include "wx/msw/dc.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/dc.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/dc.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/dc.h"
 #elif defined(__WXX11__)
    #include "wx/x11/dc.h"
 #elif defined(__WXMGL__)
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -18,8 +18,10 @@
 #include "wx/msw/dcclient.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/dcclient.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/dcclient.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/dcclient.h"
 #elif defined(__WXX11__)
 #include "wx/x11/dcclient.h"
 #elif defined(__WXMGL__)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -18,8 +18,10 @@
 #include "wx/msw/dcmemory.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/dcmemory.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/dcmemory.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/dcmemory.h"
 #elif defined(__WXX11__)
 #include "wx/x11/dcmemory.h"
 #elif defined(__WXMGL__)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -18,8 +18,10 @@
 #include "wx/msw/dcscreen.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/dcscreen.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/dcscreen.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/dcscreen.h"
 #elif defined(__WXX11__)
 #include "wx/x11/dcscreen.h"
 #elif defined(__WXMGL__)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -96,8 +96,10 @@ protected:
        #include "wx/msw/dialog.h"
    #elif defined(__WXMOTIF__)
        #include "wx/motif/dialog.h"
-    #elif defined(__WXGTK__)
+    #elif defined(__WXGTK20__)
        #include "wx/gtk/dialog.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk1/dialog.h"
    #elif defined(__WXMAC__)
        #include "wx/mac/dialog.h"
    #elif defined(__WXCOCOA__)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -218,8 +218,10 @@ protected:
    #include "wx/motif/dnd.h"
 #elif defined(__WXX11__)
    #include "wx/x11/dnd.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/dnd.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/dnd.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/dnd.h"
 #elif defined(__WXPM__)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -168,8 +168,10 @@ wxSaveFileSelector(const wxChar *what,
 #include "wx/msw/filedlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/filedlg.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/filedlg.h"
+#elif defined(__WXGTK__)
+#include "wx/generic/filedlgg.h"
 #elif defined(__WXX11__)
 #include "wx/generic/filedlgg.h"
 #elif defined(__WXMGL__)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -233,8 +233,10 @@ private:
    #include "wx/msw/font.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/font.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/font.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/font.h"
 #elif defined(__WXX11__)
    #include "wx/x11/font.h"
 #elif defined(__WXMGL__)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -86,8 +86,10 @@ protected:
    #define wxFontDialog wxGenericFontDialog
 #elif defined(__WXMSW__)
    #include "wx/msw/fontdlg.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/fontdlg.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/fontdlg.h"
 #elif defined(__WXPM__)
    #include "wx/os2/fontdlg.h"
 #elif defined(__WXMAC__)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -242,8 +242,10 @@ protected:
        #include "wx/palmos/frame.h"
    #elif defined(__WXMSW__)
        #include "wx/msw/frame.h"
-    #elif defined(__WXGTK__)
+    #elif defined(__WXGTK20__)
        #include "wx/gtk/frame.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk1/frame.h"
    #elif defined(__WXMOTIF__)
        #include "wx/motif/frame.h"
    #elif defined(__WXMAC__)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -92,8 +92,10 @@ protected:
    #define wxGauge wxGauge95
 #elif defined(__WXMOTIF__)
    #include "wx/motif/gauge.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/gauge.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/gauge.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/gauge.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -18,8 +18,10 @@
 #include "wx/msw/gdiobj.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/gdiobj.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/gdiobj.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/gdiobj.h"
 #elif defined(__WXX11__)
 #include "wx/x11/gdiobj.h"
 #elif defined(__WXMGL__)
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -22,8 +22,10 @@
 #include "wx/msw/glcanvas.h"
 #elif defined(__WXMOTIF__)
 #include "wx/x11/glcanvas.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/glcanvas.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/glcanvas.h"
 #elif defined(__WXX11__)
 #include "wx/x11/glcanvas.h"
 #elif defined(__WXMAC__)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -20,8 +20,10 @@
  #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
  #include "wx/motif/icon.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
  #include "wx/gtk/icon.h"
+#elif defined(__WXGTK__)
+  #include "wx/gtk1/icon.h"
 #elif defined(__WXX11__)
  #include "wx/x11/icon.h"
 #elif defined(__WXMGL__)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -135,8 +135,10 @@ protected:
    #include "wx/msw/listbox.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/listbox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/listbox.h"
+#elif defined(__WXGTK__)
+  #include "wx/gtk1/listbox.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/listbox.h"
 #elif defined(__WXPM__)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -22,8 +22,10 @@
    #include "wx/msw/mdi.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/mdi.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/mdi.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/mdi.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/mdi.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -504,8 +504,10 @@ protected:
    #include "wx/msw/menu.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/menu.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/menu.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/menu.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/menu.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -163,8 +163,10 @@ private:
    #include "wx/msw/menuitem.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/menuitem.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/menuitem.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/menuitem.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/menuitem.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -18,8 +18,10 @@
 #include "wx/msw/minifram.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/minifram.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/minifram.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/minifram.h"
 #elif defined(__WXX11__)
 #include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -49,10 +49,12 @@ private:
 #include "wx/msw/msgdlg.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/msgdlg.h"
-#elif defined(__WXGTK__) && defined(__WXGTK20__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/msgdlg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/msgdlgg.h"
+#elif defined(__WXGTK__)
+#include "wx/generic/msgdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/msgdlg.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -152,8 +152,10 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
    #include  "wx/msw/notebook.h"
 #elif defined(__WXMOTIF__)
    #include  "wx/generic/notebook.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include  "wx/gtk/notebook.h"
+#elif defined(__WXGTK__)
+    #include  "wx/gtk1/notebook.h"
 #elif defined(__WXMAC__)
    #include  "wx/mac/notebook.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -18,8 +18,10 @@
 #include "wx/msw/pen.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
 #include "wx/x11/pen.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/pen.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/pen.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/pen.h"
 #elif defined(__WXMAC__)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -56,8 +56,10 @@ public:
    #include "wx/msw/popupwin.h"
 #elif defined(__WXPM__)
    #include "wx/os2/popupwin.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/popupwin.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/popupwin.h"
 #elif defined(__WXX11__)
    #include "wx/x11/popupwin.h"
 #elif defined(__WXMOTIF__)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -83,8 +83,10 @@ private:
    #include "wx/msw/radiobox.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/radiobox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/radiobox.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/radiobox.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/radiobox.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -41,8 +41,10 @@ extern WXDLLEXPORT_DATA(const wxChar) wxRadioButtonNameStr[];
    #include "wx/msw/radiobut.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/radiobut.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/radiobut.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/radiobut.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/radiobut.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -18,8 +18,10 @@
    #include "wx/palmos/region.h"
 #elif defined(__WXMSW__)
    #include "wx/msw/region.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/region.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/region.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
    #include "wx/x11/region.h"
 #elif defined(__WXMGL__)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -62,8 +62,10 @@ private:
    #include "wx/msw/scrolbar.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/scrolbar.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/scrolbar.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/scrolbar.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/scrolbar.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -245,8 +245,10 @@ protected:
        { return ScrollGetWindowSizeForVirtualSize(size); }

 // include the declaration of wxScrollHelperNative if needed
-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
    #include "wx/gtk/scrolwin.h"
+#elif defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+    #include "wx/gtk1/scrolwin.h"
 #else
    typedef wxScrollHelper wxScrollHelperNative;
 #endif
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -130,8 +130,10 @@ private:
    #endif
 #elif defined(__WXMOTIF__)
    #include "wx/motif/slider.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/slider.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/slider.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -78,8 +78,10 @@ protected:
    #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/spinbutt.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/spinbutt.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/spinbutt.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/spinbutt.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -63,8 +63,10 @@ protected:
    #include "wx/msw/spinctrl.h"
 #elif defined(__WXPM__)
    #include "wx/os2/spinctrl.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/spinctrl.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/spinctrl.h"
 #elif defined(__WXMOTIF__)
    #include "wx/generic/spinctlg.h"
 #elif defined(__WXMAC__)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -56,8 +56,10 @@ protected:
    #include "wx/msw/statbmp.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/statbmp.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/statbmp.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statbmp.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/statbmp.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -56,8 +56,10 @@ private:
    #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/statbox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/statbox.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/statbox.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -84,8 +84,10 @@ protected:
    #include "wx/univ/statline.h"
 #elif defined(__WXMSW__)
    #include "wx/msw/statline.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/statline.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statline.h"
 #elif defined(__WXPM__)
    #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -49,8 +49,10 @@ private:
    #include "wx/msw/stattext.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/stattext.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/stattext.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/stattext.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/stattext.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -422,8 +422,10 @@ protected:
    #include "wx/msw/textctrl.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/textctrl.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/textctrl.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/textctrl.h"
 #elif defined(__WXMAC__)
    #include "wx/mac/textctrl.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -29,8 +29,10 @@ END_DECLARE_EVENT_TYPES()

 #if defined(__WXMSW__)
    #include "wx/msw/tglbtn.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/tglbtn.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/tglbtn.h"
 # elif defined(__WXMOTIF__)
    #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -112,8 +112,10 @@ protected:
    #include "wx/msw/timer.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/timer.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/timer.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/timer.h"
 #elif defined(__WXX11__) || defined(__WXMGL__)
    #include "wx/generic/timer.h"
 #elif defined (__WXCOCOA__)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -67,8 +67,10 @@ enum
       #include "wx/msw/tbarmsw.h"
    #elif defined(__WXMOTIF__)
       #include "wx/motif/toolbar.h"
-    #elif defined(__WXGTK__)
+    #elif defined(__WXGTK20__)
        #include "wx/gtk/tbargtk.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk1/tbargtk.h"
    #elif defined(__WXMAC__)
       #include "wx/mac/toolbar.h"
    #elif defined(__WXCOCOA__)
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -20,8 +20,10 @@
 #include "wx/msw/tooltip.h"
 #elif defined(__WXMOTIF__)
 // #include "wx/motif/tooltip.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
 #include "wx/gtk/tooltip.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk1/tooltip.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/tooltip.h"
 #elif defined(__WXCOCOA__)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -254,9 +254,12 @@ protected:
 #elif defined(__WXMSW__)
    #include "wx/msw/toplevel.h"
    #define wxTopLevelWindowNative wxTopLevelWindowMSW
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #include "wx/gtk/toplevel.h"
    #define wxTopLevelWindowNative wxTopLevelWindowGTK
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowGTK
 #elif defined(__WXX11__)
    #include "wx/x11/toplevel.h"
    #define wxTopLevelWindowNative wxTopLevelWindowX11
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1348,13 +1348,20 @@ private:
    #include "wx/msw/window.h"
 #elif defined(__WXMOTIF__)
    #include "wx/motif/window.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
    #ifdef __WXUNIVERSAL__
        #define wxWindowNative wxWindowGTK
    #else // !wxUniv
        #define wxWindowGTK wxWindow
    #endif // wxUniv
    #include "wx/gtk/window.h"
+#elif defined(__WXGTK__)
+    #ifdef __WXUNIVERSAL__
+        #define wxWindowNative wxWindowGTK
+    #else // !wxUniv
+        #define wxWindowGTK wxWindow
+    #endif // wxUniv
+    #include "wx/gtk1/window.h"
 #elif defined(__WXX11__)
    #ifdef __WXUNIVERSAL__
        #define wxWindowNative wxWindowX11