X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/847379b00c3349dc693535b65296b92cc4646897..cc30c63a4cf2ee1ae991b584e2dec2cac6b7819a:/include/wx/control.h diff --git a/include/wx/control.h b/include/wx/control.h index 98905ebe3e..aed113f803 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 -extern WXDLLEXPORT_DATA(const wxChar*) wxControlNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxControlNameStr[]; // ---------------------------------------------------------------------------- // wxControl is the base class for all controls @@ -50,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 @@ -66,6 +67,9 @@ public: 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 @@ -106,8 +110,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__)