don't redeclare vsscanf() for Windows compilers, the case of missing declaration...

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

diff --git a/include/wx/mac/carbon/spinctrl.h b/include/wx/mac/carbon/spinctrl.h
old mode 100755 (executable)
new mode 100644 (file)
index e29c806..38fd7a9
--- a/include/wx/mac/carbon/spinctrl.h
+++ b/include/wx/mac/carbon/spinctrl.h
@@ -22,18 +22,18 @@
 
 #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 WXDLLIMPEXP_FWD_CORE wxSpinButton;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxSpinCtrlText;
+class WXDLLIMPEXP_FWD_CORE wxSpinCtrlButton;
 
 // ----------------------------------------------------------------------------
 // wxSpinCtrl is a combination of wxTextCtrl and wxSpinButton
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxSpinCtrl : public wxControl
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl
 {
 public:
     wxSpinCtrl() { Init(); }
@@ -80,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; }
@@ -94,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;
@@ -107,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)
 };
 
@@ -119,7 +125,7 @@ private:
 
 #include "wx/textctrl.h"
 
-class WXDLLEXPORT wxSpinCtrl : public wxTextCtrl
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxTextCtrl
 {
 public:
     wxSpinCtrl() { Init(); }