X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..dc484d491b15355285a89da275c58c2ef247d1f4:/include/wx/control.h diff --git a/include/wx/control.h b/include/wx/control.h index cc394434e3..560a476e05 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -22,7 +22,7 @@ #include "wx/window.h" // base class -extern WXDLLEXPORT_DATA(const wxChar*) wxControlNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[]; // ---------------------------------------------------------------------------- // wxControl is the base class for all controls @@ -46,6 +46,11 @@ public: // get the control alignment (left/right/centre, top/bottom/centre) int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; } + // get the string without mnemonic characters ('&') + static wxString GetLabelText(const wxString& label); + + // get just the text of the label, without mnemonic characters ('&') + wxString GetLabelText() const { return GetLabelText(GetLabel()); } // controls by default inherit the colours of their parents, if a // particular control class doesn't want to do it, it can override @@ -62,16 +67,8 @@ public: virtual void SetLabel( const wxString &label ); virtual bool SetFont(const wxFont& font); - // Reserved for future use - virtual void ReservedControlFunc1() {} - virtual void ReservedControlFunc2() {} - virtual void ReservedControlFunc3() {} - virtual void ReservedControlFunc4() {} - virtual void ReservedControlFunc5() {} - virtual void ReservedControlFunc6() {} - virtual void ReservedControlFunc7() {} - virtual void ReservedControlFunc8() {} - virtual void ReservedControlFunc9() {} + // wxControl-specific processing after processing the update event + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event); protected: // creates the control (calls wxWindowBase::CreateBase inside) and adds it @@ -87,17 +84,6 @@ protected: // initialize the common fields of wxCommandEvent void InitCommandEvent(wxCommandEvent& event) const; - // set the initial window size if none is given (i.e. at least one of the - // components of the size passed to ctor/Create() is -1) - // - // normally just calls SetBestSize() but can be overridden not to do it for - // the controls which have to do some additional initialization (e.g. add - // strings to list box) before their best size can be accurately calculated - virtual void SetInitialBestSize(const wxSize& size) - { - SetBestSize(size); - } - DECLARE_NO_COPY_CLASS(wxControlBase) }; @@ -113,8 +99,10 @@ protected: #include "wx/msw/control.h" #elif defined(__WXMOTIF__) #include "wx/motif/control.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/control.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/control.h" #elif defined(__WXMAC__) #include "wx/mac/control.h" #elif defined(__WXCOCOA__)