X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..b02dd12239c8a59b9a545d9fcb04974f8ad02c6b:/include/wx/pickerbase.h?ds=sidebyside diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h index 1982838cc2..16afd715f0 100644 --- a/include/wx/pickerbase.h +++ b/include/wx/pickerbase.h @@ -31,13 +31,14 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- #define wxPB_USE_TEXTCTRL 0x0002 +#define wxPB_SMALL 0x8000 -class WXDLLIMPEXP_CORE wxPickerBase : public wxControl +class WXDLLIMPEXP_CORE wxPickerBase : public wxNavigationEnabled { public: // ctor: text is the associated text control wxPickerBase() : m_text(NULL), m_picker(NULL), m_sizer(NULL) - { WX_INIT_CONTROL_CONTAINER(); } + { } virtual ~wxPickerBase() {} @@ -121,8 +122,6 @@ protected: void OnTextCtrlUpdate(wxCommandEvent &); void OnTextCtrlKillFocus(wxFocusEvent &); - void OnSize(wxSizeEvent &); - // returns the set of styles for the attached wxTextCtrl // from given wxPickerBase's styles virtual long GetTextCtrlStyle(long style) const @@ -178,10 +177,6 @@ protected: private: DECLARE_ABSTRACT_CLASS(wxPickerBase) - DECLARE_EVENT_TABLE() - - // This class must be something just like a panel... - WX_DECLARE_CONTROL_CONTAINER(); };