X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f6475c145b713efc0c3d8b482338438e927b763..ce668f297b03143bc15014a37c12e610c49c6e6b:/include/wx/pickerbase.h?ds=sidebyside diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h index e6a441fc26..1982838cc2 100644 --- a/include/wx/pickerbase.h +++ b/include/wx/pickerbase.h @@ -14,10 +14,12 @@ #include "wx/control.h" #include "wx/sizer.h" +#include "wx/containr.h" -class WXDLLIMPEXP_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxToolTip; -extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxPickerBase is the base class for the picker controls which support @@ -35,7 +37,7 @@ class WXDLLIMPEXP_CORE wxPickerBase : public wxControl public: // ctor: text is the associated text control wxPickerBase() : m_text(NULL), m_picker(NULL), m_sizer(NULL) - { m_container.SetContainerWindow(this); } + { WX_INIT_CONTROL_CONTAINER(); } virtual ~wxPickerBase() {} @@ -48,9 +50,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr, - long textstyle = 0); - + const wxString& name = wxButtonNameStr); public: // public API @@ -105,12 +105,16 @@ public: // public API wxControl *GetPickerCtrl() { return m_picker; } -public: // methods that derived class must/may override - + // methods that derived class must/may override virtual void UpdatePickerFromTextCtrl() = 0; virtual void UpdateTextCtrlFromPicker() = 0; -protected: // utility functions +protected: + // overridden base class methods +#if wxUSE_TOOLTIPS + virtual void DoSetToolTip(wxToolTip *tip); +#endif // wxUSE_TOOLTIPS + // event handlers void OnTextCtrlDelete(wxWindowDestroyEvent &);