added cw6 fixes and patrick's patches

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

diff --git a/include/wx/os2/spinbutt.h b/include/wx/os2/spinbutt.h
index 12d4ecb62ae43d6db28d84027f1c9e80b2d4a59b..643ae907d9002a996b41c1d6ec4a8aced7b7ae98 100644 (file)
--- a/include/wx/os2/spinbutt.h
+++ b/include/wx/os2/spinbutt.h
@@ -15,7 +15,7 @@
 #include "wx/control.h"
 #include "wx/event.h"
 
-class WXDLLEXPORT wxSpinButton: public wxControl
+class WXDLLEXPORT wxSpinButton: public wxSpinButtonBase
 {
 public:
     // Construction
@@ -49,7 +49,7 @@ public:
                           ,int maxVal
                          );
 
-    // Implementation    
+    // Implementation
     virtual bool OS2Command( WXUINT param
                             ,WXWORD id
                            );
@@ -64,7 +64,7 @@ public:
                             );
 
 protected:
-   virtual wxSize DoGetBestSize();
+   virtual wxSize DoGetBestSize() const;
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 };