disabled wxMBConv(wxFONTENCODING_UTF7) test -- it doesn't work under Unix with iconv()

[wxWidgets.git] / include / wx / spinctrl.h

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"
     #include "wx/msw/spinctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/spinctrl.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/spinctrl.h"
     #include "wx/gtk/spinctrl.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/spinctrl.h"

 #elif defined(__WXMOTIF__)
     #include "wx/generic/spinctlg.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXMOTIF__)
     #include "wx/generic/spinctlg.h"
 #elif defined(__WXMAC__)