X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/control.h?ds=sidebyside diff --git a/include/wx/control.h b/include/wx/control.h index 64306ff8da..cf939b5459 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -16,17 +16,13 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "controlbase.h" -#endif - #include "wx/defs.h" #if wxUSE_CONTROLS #include "wx/window.h" // base class -WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[]; // ---------------------------------------------------------------------------- // wxControl is the base class for all controls @@ -50,6 +46,36 @@ public: // get the control alignment (left/right/centre, top/bottom/centre) int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; } + // get just the text of the label, without mnemonic characters ('&') + wxString GetLabelText() const { return GetLabelText(GetLabel()); } + + virtual void SetLabel(const wxString& label) + { + m_labelOrig = label; + + InvalidateBestSize(); + + wxWindow::SetLabel(label); + } + + virtual wxString GetLabel() const + { + // return the original string, as it was passed to SetLabel() + // (i.e. with wx-style mnemonics) + return m_labelOrig; + } + + // static utilities: + + // get the string without mnemonic characters ('&') + static wxString GetLabelText(const wxString& label); + + // removes the mnemonics characters + static wxString RemoveMnemonics(const wxString& str); + + // escapes the mnemonics characters ('&') by doubling them + static wxString EscapeMnemonics(const wxString& str); + // controls by default inherit the colours of their parents, if a // particular control class doesn't want to do it, it can override @@ -63,9 +89,11 @@ public: // if the button was clicked) virtual void Command(wxCommandEvent &event); - virtual void SetLabel( const wxString &label ); virtual bool SetFont(const wxFont& font); + // wxControl-specific processing after processing the update event + virtual void DoUpdateWindowUI(wxUpdateUIEvent& event); + protected: // creates the control (calls wxWindowBase::CreateBase inside) and adds it // to the list of parents children @@ -80,16 +108,8 @@ 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); - } + // this field contains the label in wx format, i.e. with '&' mnemonics + wxString m_labelOrig; DECLARE_NO_COPY_CLASS(wxControlBase) }; @@ -100,14 +120,16 @@ protected: #if defined(__WXUNIVERSAL__) #include "wx/univ/control.h" -#elif defined(__PALMOS__) +#elif defined(__WXPALMOS__) #include "wx/palmos/control.h" #elif defined(__WXMSW__) #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__)