X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe161a2685012cf90bb5bfe95f2260aee71d8ad7..f5e0b4bc7c729ff41e66fb7894fb1387f860bdb2:/include/wx/control.h diff --git a/include/wx/control.h b/include/wx/control.h index 5fd882ce0c..b6136bd449 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -32,11 +32,10 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr; // wxControl is the base class for all controls // ---------------------------------------------------------------------------- - class WXDLLEXPORT wxControlBase : public wxWindow { public: - wxControlBase() { Init(); } + wxControlBase() { } virtual ~wxControlBase(); @@ -64,16 +63,10 @@ public: // if the button was clicked) virtual void Command(wxCommandEvent &event); - - virtual void SetLabel(const wxString& label); + virtual void SetLabel( const wxString &label ); virtual bool SetFont(const wxFont& font); - virtual bool GetAdjustMinSizeFlag() const { return m_adjustMinSize; } - void SetAdjustMinSizeFlag(bool adjust) { m_adjustMinSize = adjust; } - - + protected: - void Init(); - // creates the control (calls wxWindowBase::CreateBase inside) and adds it // to the list of parents children bool CreateControl(wxWindowBase *parent, @@ -98,9 +91,6 @@ protected: SetBestSize(size); } - // should minsize and size be adjusted when font or label change? - bool m_adjustMinSize; - DECLARE_NO_COPY_CLASS(wxControlBase) };