wxChar -> char

[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 384e2b1..5a77b2a
--- a/include/wx/mac/carbon/spinctrl.h
+++ b/include/wx/mac/carbon/spinctrl.h
@@ -22,8 +22,12 @@
 
 #if wxUSE_SPINBTN 
 
 
 #if wxUSE_SPINBTN 
 

-class WXDLLEXPORT wxSpinButton;
-class WXDLLEXPORT wxTextCtrl;
+#include "wx/containr.h"
+
+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
 
 // ----------------------------------------------------------------------------
 // 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);
     // 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; }


@@ -90,6 +93,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;


@@ -103,7 +108,12 @@ private:
     wxTextCtrl *m_text;
     wxSpinButton *m_btn;
     
     wxTextCtrl *m_text;
     wxSpinButton *m_btn;
     

+    friend class wxSpinCtrlText;
+    friend class wxSpinCtrlButton;
+    
+    int            m_oldValue;

 private:
 private:

+    DECLARE_EVENT_TABLE()

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