X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..115563867dac8edf57b6d2c6ae95910c7f277d77:/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 new mode 100644 index e7c941b14a..5a77b2a9f7 --- a/include/wx/mac/carbon/spinctrl.h +++ b/include/wx/mac/carbon/spinctrl.h @@ -6,7 +6,7 @@ // Created: 28.10.99 // RCS-ID: $Id$ // Copyright: (c) Vadim Zeitlin -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_MAC_SPINCTRL_H_ @@ -22,12 +22,12 @@ #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 @@ -93,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; @@ -106,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) };