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

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

diff --git a/include/wx/accel.h b/include/wx/accel.h
index f7bf3b53fd60ad70d5196dac1a1d2061787b1759..5e22e956231df62ba65d13cd98f20d122c36357d 100644 (file)
--- 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__)

diff --git a/include/wx/app.h b/include/wx/app.h
index 1e0c5786ef95c83938227e7d0c6b7e129b0fa3da..8b813caa332ceaae27d19313bb7da5e9258f2e3a 100644 (file)
--- 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__)

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 2892ab5186e0319bd40f517c0421b0ca2b4523a1..b853687661544faf88e7e4545ee182bf382a88c4 100644 (file)
--- 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__)

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 3db49e1b44d97baf02461b2be159b57556288672..2c4d1d7767e97d8d0fcb02a9ad7703fe2dd1a426 100644 (file)
--- 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__)

diff --git a/include/wx/brush.h b/include/wx/brush.h
index 9d01935be2f7ad68abc7504617104b76bfc28d88..f3ea86693329cda721da77b96c09c511735269bb 100644 (file)
--- 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__)

diff --git a/include/wx/button.h b/include/wx/button.h
index b1a05acf0cdefbda9c3623004c3d6107851b11e6..ee53cf704d8c3144247e2d636169a9884dff5238 100644 (file)
--- 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__)

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 5d574e9e5bc3dca6e53f9cab826a5b93eff3c354..8eea49bcaba0015c4b02b900b0d6c3d3ba135f41 100644 (file)
--- 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__)

diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index cd0933ca25aafc7d212bb1cdc89d7089719013f0..f976b0c1f4da787d394ca550c0faeb13b369d432 100644 (file)
--- 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__)

diff --git a/include/wx/choice.h b/include/wx/choice.h
index feb94c7ffd1519856dae125ca39c13bc495789eb..63f3267936f9e4457b97f472635b1efdd5559cff 100644 (file)
--- 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__)

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index a9173a8bca0a3fc1a0e4cdecc8bf270540ebbb4a..6c2d3ac5eb7093cf9674cd8091d4cc269d50d2cf 100644 (file)
--- 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__)

diff --git a/include/wx/colour.h b/include/wx/colour.h
index d5fc5d500e66a9cb2cc0693be04a5c0d4a7a91a4..7daa7cf93576f807cc1fdb82ef2e955c2653f3d5 100644 (file)
--- 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__)

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 2a7ffa1faba8df4c1c76fefca0fe04dd94f043bf..6b361163eac045a7ab14128417025fa123781a78 100644 (file)
--- 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__)

diff --git a/include/wx/control.h b/include/wx/control.h
index ce8aabe406014541454d3240db34e608164e61b4..8d83d135645baa06993fb2bb6a62ff5993f595a9 100644 (file)
--- 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__)

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index f86aa818d208981060f61316a6bd5db6fc88b74c..78f847c2238c09e16eecc59598b57ef9e948501c 100644 (file)
--- 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__)

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 12c2101f10e0a2960982d94ce6c33ac102df21df..f3759b7cbdfb0cb32c03fb4d6be0c134f286b097 100644 (file)
--- 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__)

diff --git a/include/wx/dc.h b/include/wx/dc.h
index e8cb0ab7160f24b0a5fc5bf14cfb68e972e5f237..a95bd99da478c6726a1df9550107e98762e72d78 100644 (file)
--- 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__)

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index 7ae8709ba22e5aebdb7641d53cbaac908df88636..3397bf623931d72e9cc243aed5d13b00375c9f86 100644 (file)
--- 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__)

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index f8e3f95bc3a726a69a6dd29ac19c74a922f0dac3..bddbd093eaad78c15865baf33b5e9f7be19431e2 100644 (file)
--- 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__)

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 6b25147b50932e35b6e5beacac14194b7946c281..581e359dbf67ef1a708879ca135352a34d3aae2e 100644 (file)
--- 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__)

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index e56f985490bb188eef2d2110cab1856b244aa5f4..9552597133dbff3cf0e01842394c80728fb85da2 100644 (file)
--- 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__)

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 7bf6c328e6fdf432c43f86bdaf77580ce9886fb2..ccc82d422a9136e7fed3470e4cf291c1f336dfa5 100644 (file)
--- 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__)

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 7e1a92bfb61e20dd97f7583eeef83201783a0bca..df18f4be1b382187d5c3d9384df6d08727d6e55f 100644 (file)
--- 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__)

diff --git a/include/wx/font.h b/include/wx/font.h
index 3ab46e032c1d58c827f316776d3a6102f04f220f..33f6068e093c0d73f41a3f03d7b1d79f9a918ba2 100644 (file)
--- 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__)

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 26dc4924f41260c350b35a131e4ae64aaf3296ec..480e5dcb9db9eaef218fa08aa40ee416777b732d 100644 (file)
--- 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__)

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 6801dffc152b81fabcf06763d44d2d47c252048e..87c08f3ed7a5737fbaad67f8198b68a7a8346e8e 100644 (file)
--- 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__)

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 9c81e0223e6ce6e2dfe6c4e96b6a6a123bb5a106..31757e87c9549121303a21360d998a6f66d9b5fa 100644 (file)
--- 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__)

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index 9460592e6034836a530a99c23e12066b2d16cf85..89323a28b4800a48fdd834e48b92913f9047f37a 100644 (file)
--- 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__)

diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 607c41232b87a23aff55134e760ce5ff5f57e1f9..b4f2bac6b63755a310f3a6428fe8ded70c9506e8 100644 (file)
--- 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__)

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 4bccbc43d95c56c6d455a2bfa998b315b54ae0b3..bcf9c53ca8df4b125625a5a376e9b217d7bf56aa 100644 (file)
--- 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__)

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index b415951c7badb47fe0385f0f0e56d58913792d40..0556f805cfa4cfe0cf42aca5a48b212ce43cc000 100644 (file)
--- 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__)

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 199e701d835785db5a0e576c3e8406fc063f1656..29c861e1014f5961d35c3cbf991f8610a4e2b259 100644 (file)
--- 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__)

diff --git a/include/wx/menu.h b/include/wx/menu.h
index 5e31cede132774c4921df014c6610dd24d864930..23cf0efa5b41109a1395123e11c672882a055f81 100644 (file)
--- 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__)

diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index b4d27e5b3b184f8e08b76d000d8adad48bbc6831..fa7b1e4f175fdb6bfcb1db295996436a78d25d4e 100644 (file)
--- 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__)

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 9826eb274dc622ac80d9a13836064f7766a27437..915781b2c2d71aff754f1f33147e75c264eb2f6c 100644 (file)
--- 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__)

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 45b12423ebc18dd597868f4fe3830cbd3b8ba380..8c367fb9b6347ff6a1873cdff1e6eb88b623b73a 100644 (file)
--- 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__)

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index eab5947b7948fa4460a70ebff087f824a4605bfc..5555127425a0ac6a4c77f9fbd25763d7860ceabf 100644 (file)
--- 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__)

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 239642819a6c15526e9e765e8002db460afec7d0..6101caf8cf3dfdbcb137fdc6c484856ca194c6d9 100644 (file)
--- 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__)

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 7a4d3c136b22c253dba967111ee77e55d3425f84..dabd5c80638b6548579b1eec4d24bfc562cd2e54 100644 (file)
--- 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__)

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 125075214a396f13776291963791af58a43d74d4..0cbb947156cf542dafbbacb65899ee21851edb3a 100644 (file)
--- 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__)

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index 26e02b85a31a7fb9a4654e4303ed0af5c5dc0e7a..2df27e03f7202d17836556cc13ea7687f9388a3f 100644 (file)
--- 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__)

diff --git a/include/wx/region.h b/include/wx/region.h
index 425e8198fe919e7e1289f9ec933ce401f13529c1..15cd749a7f9204ce282ba0aa3bc72c347b2fb421 100644 (file)
--- 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__)

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 2c39fb25596e845428e5f0f8c949c174826f5408..6cdf392a2697300440e5b1137bc2ac28b435831f 100644 (file)
--- 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__)

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 4fa1a03af1c821a5e6c5062de834c7cbaac24fe8..dcbc0ef320a672adc5b43e5e663b646c0b228c5a 100644 (file)
--- 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

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 12e488c0993455d162b63b587990a808dac43ba1..a3c114f06431715a46610b96aa5ec021ee5832f1 100644 (file)
--- 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__)

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index d2f817ad7792bc712dc6cf1bf7d5292972c4b6a8..776868fa73b4c1eedd978838d3b9f7f322a1f192 100644 (file)
--- 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__)

diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 7490dc47663748b83c49f996bb4353ab84caa939..6080b61365c86eea4eb919457d5b05b14da0829f 100644 (file)
--- 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__)

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index bdd278fd075522d04fda0f1ea6e869ab4183d90d..73f773c9f81d48bb0a93971e8c180cf613b79a56 100644 (file)
--- 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__)

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 29ab7c42e0abe857959de886057b8ec5d705652a..efeeee65b21f8f6ff4631148ef43ccc3ad4731c8 100644 (file)
--- 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__)

diff --git a/include/wx/statline.h b/include/wx/statline.h
index f204805800917d47f51e949b6ba47e42378f1b64..905bb3152f7b5de236c1483b4885d3001936baa0 100644 (file)
--- 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__)

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 4ac8badb076be8192138b8e93e749359f00fb3e2..025ca8bb0fa901f1ae11710be7baba9400b41031 100644 (file)
--- 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__)

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 48e9ae640f795b2f3156bf0df3e3f128e52edb15..aa37d4ba96afcc4fdbc90c4a475859f3ed53cf0a 100644 (file)
--- 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__)

diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index 1827e0b49413ad54aa1e769c02754f27eb275b2a..2972d5f04a4cde613b95749a5ddf72a521a38a5a 100644 (file)
--- 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__)

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 1cc13702a471f8e4afdc7b9a4de1dad160621c40..3f25d378e99680abc4a35ce602571f2eea957b72 100644 (file)
--- 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__)

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 62cbe202c4393e6c1c0cd4be95473c16568dd911..83192210aa67f0525532bd7758dba1037fc38eba 100644 (file)
--- 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__)

diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index f7ff630068611050ce37e65c9f28b665a37889c0..0e4ed84c8b0b3a1c3cf5931a788eb87acdad3201 100644 (file)
--- 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__)

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 7aeecdc65abb9a26099a0ebe5f2bbd44e643b8e2..b52ae52b7956f6f0b1fa02f89d745bbb89e23489 100644 (file)
--- 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

diff --git a/include/wx/window.h b/include/wx/window.h
index da86c0b4704629a1b3f65e211c11678ffa37ae42..abb99019c2cde3e7258b2b9f7101d6468885c76e 100644 (file)
--- 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