added wxDataViewModel::HasContainerColumns

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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 7f7edb9e5be612a10a83e889c02b60537d0b9886..776868fa73b4c1eedd978838d3b9f7f322a1f192 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -39,7 +39,7 @@
 class WXDLLEXPORT wxSpinButtonBase : public wxControl
 {
 public:
 class WXDLLEXPORT wxSpinButtonBase : public wxControl
 {
 public:

-    // ctor intiializes the range with the default (0..100) values
+    // ctor initializes the range with the default (0..100) values

     wxSpinButtonBase() { m_min = 0; m_max = 100; }
 
     // accessors
     wxSpinButtonBase() { m_min = 0; m_max = 100; }
 
     // accessors


@@ -74,12 +74,14 @@ protected:
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/spinbutt.h"
 
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/spinbutt.h"

-#elif defined(__WXMSW__) && defined(__WIN95__)
+#elif defined(__WXMSW__)

     #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/spinbutt.h"
     #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/spinbutt.h"

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

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

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

 #elif defined(__WXMAC__)
     #include "wx/mac/spinbutt.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/spinbutt.h"
 #elif defined(__WXCOCOA__)