Made toolbars sticky, i.e. you need to drag them

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

diff --git a/include/wx/mac/carbon/spinctrl.h b/include/wx/mac/carbon/spinctrl.h
index e29c806d7273a8fd4a271f6940cc1d54d0c3ca3f..ebc21230680cf57e57a62e80791692440e9ff2ff 100755 (executable)
--- a/include/wx/mac/carbon/spinctrl.h
+++ b/include/wx/mac/carbon/spinctrl.h
@@ -22,9 +22,7 @@
 
 #if wxUSE_SPINBTN 
 
 
 #if wxUSE_SPINBTN 
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "spinctlg.h"
-#endif
+#include "wx/containr.h"

 
 class WXDLLEXPORT wxSpinButton;
 class WXDLLEXPORT wxTextCtrl;
 
 class WXDLLEXPORT wxSpinButton;
 class WXDLLEXPORT wxTextCtrl;


@@ -80,7 +78,6 @@ public:
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = TRUE);
     virtual bool Show(bool show = TRUE);
     // forward these functions to all subcontrols
     virtual bool Enable(bool enable = TRUE);
     virtual bool Show(bool show = TRUE);

-    virtual void SetFocus();

 
     // get the subcontrols
     wxTextCtrl *GetText() const { return m_text; }
 
     // get the subcontrols
     wxTextCtrl *GetText() const { return m_text; }


@@ -94,6 +91,8 @@ public:
     // number is out of range
     bool GetTextValue(int *val) const;
 
     // number is out of range
     bool GetTextValue(int *val) const;
 

+    WX_DECLARE_CONTROL_CONTAINER();
+

 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;
 protected:
     // override the base class virtuals involved into geometry calculations
     virtual wxSize DoGetBestSize() const;


@@ -108,6 +107,7 @@ private:
     wxSpinButton *m_btn;
     
 private:
     wxSpinButton *m_btn;
     
 private:

+    DECLARE_EVENT_TABLE()

     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };
 
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };