Restore compilation with --enable-stl, fix SetFocus with the generic control, and...

[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 384e2b1d7a3d331faee12756a08e6cd330759b72..5c513561a6bb810eab143d92cb2b1fbd1214fb83 100755 (executable)
--- a/include/wx/mac/carbon/spinctrl.h
+++ b/include/wx/mac/carbon/spinctrl.h
@@ -22,8 +22,12 @@
 
 #if wxUSE_SPINBTN 
 
+#include "wx/containr.h"
+
 class WXDLLEXPORT wxSpinButton;
 class WXDLLEXPORT wxTextCtrl;
+class WXDLLEXPORT wxSpinCtrlText;
+class WXDLLEXPORT wxSpinCtrlButton;
 
 // ----------------------------------------------------------------------------
 // wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton
@@ -76,7 +80,6 @@ public:
     // 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; }
@@ -90,6 +93,8 @@ public:
     // 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;
@@ -103,7 +108,12 @@ private:
     wxTextCtrl *m_text;
     wxSpinButton *m_btn;
     
+    friend class wxSpinCtrlText;
+    friend class wxSpinCtrlButton;
+    
+    int            m_oldValue;
 private:
+    DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
 };