X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cd6a9ad50c00a94e62558a3b55e814028d81100..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/generic/spinctlg.h?ds=inline diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h index 8eb517b646..bdd0d4e55e 100644 --- a/include/wx/generic/spinctlg.h +++ b/include/wx/generic/spinctlg.h @@ -25,7 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxSpinButton; class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -class wxSpinCtrlText; // wxTextCtrl used for the wxSpinCtrlGenericBase +class wxSpinCtrlTextGeneric; // wxTextCtrl used for the wxSpinCtrlGenericBase // The !wxUSE_SPINBTN version's GetValue() function conflicts with the // wxTextCtrl's GetValue() and so you have to input a dummy int value. @@ -40,7 +40,7 @@ class wxSpinCtrlText; // wxTextCtrl used for the wxSpinCtrlGenericBase // function ambiguity. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSpinCtrlGenericBase : public wxSpinCtrlBase +class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxSpinCtrlBase { public: wxSpinCtrlGenericBase() { Init(); } @@ -80,7 +80,7 @@ public: // forward these functions to all subcontrols virtual bool Enable(bool enable = true); virtual bool Show(bool show = true); - virtual bool Reparent(wxWindow *newParent); + virtual bool Reparent(wxWindowBase *newParent); // get the subcontrols wxTextCtrl *GetText() const { return m_textCtrl; } @@ -91,7 +91,7 @@ public: void OnTextEnter(wxCommandEvent& event); void OnTextChar(wxKeyEvent& event); - friend class wxSpinCtrlText; + friend class wxSpinCtrlTextGeneric; protected: // override the base class virtuals involved into geometry calculations @@ -140,7 +140,7 @@ private: #include "wx/textctrl.h" -class WXDLLEXPORT wxSpinCtrlGenericBase : public wxTextCtrl +class WXDLLIMPEXP_CORE wxSpinCtrlGenericBase : public wxTextCtrl { public: wxSpinCtrlGenericBase() : m_value(0), m_min(0), m_max(100),