OS/2 Statusbar fixes

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

diff --git a/include/wx/gtk/spinbutt.h b/include/wx/gtk/spinbutt.h
index 440c26afe73dc7bf6dc2cb233e7c3b4953325d65..96e13d0100bb4b25f501c597bab7c93b017900e6 100644 (file)
--- a/include/wx/gtk/spinbutt.h
+++ b/include/wx/gtk/spinbutt.h
@@ -8,21 +8,25 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKSPINPUTTH__
+#ifndef __GTKSPINBUTTH__

 #define __GTKSPINBUTTH__
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
 #define __GTKSPINBUTTH__
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_SPINBTN
+
+#include "wx/control.h"
+

 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------
 
 class wxSpinButton : public wxSpinButtonBase
 {
 //-----------------------------------------------------------------------------
 // wxSpinButton
 //-----------------------------------------------------------------------------
 
 class wxSpinButton : public wxSpinButtonBase
 {

-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
-

 public:
     wxSpinButton() { }
     wxSpinButton( wxWindow *parent, wxWindowID id = -1,
 public:
     wxSpinButton() { }
     wxSpinButton( wxWindow *parent, wxWindowID id = -1,


@@ -31,7 +35,6 @@ public:
     {
         Create(parent, id, pos, size, style, name);
     }
     {
         Create(parent, id, pos, size, style, name);
     }

-    ~wxSpinButton();

 
     bool Create( wxWindow *parent, wxWindowID id = -1,
             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 
     bool Create( wxWindow *parent, wxWindowID id = -1,
             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,


@@ -52,9 +55,16 @@ public:
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 

+protected:
+    virtual wxSize DoGetBestSize() const;
+

 private:
     DECLARE_EVENT_TABLE()
 private:
     DECLARE_EVENT_TABLE()

+    DECLARE_DYNAMIC_CLASS(wxSpinButton)

 };
 
 };
 

+#endif
+  // wxUSE_SPINBTN
+

 #endif
     // __GTKSPINBUTTH__
 #endif
     // __GTKSPINBUTTH__