X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bca03736369e836cce9297509505c5972e775dd..44580804c2b478ebd36f59c9b416be560c4ef5bf:/src/common/ctrlcmn.cpp diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp index 46532a9cda..83f789b824 100644 --- a/src/common/ctrlcmn.cpp +++ b/src/common/ctrlcmn.cpp @@ -33,9 +33,10 @@ #include "wx/radiobut.h" #include "wx/statbmp.h" #include "wx/bitmap.h" + #include "wx/utils.h" // for wxStripMenuCodes() #endif -const wxChar wxControlNameStr[] = wxT("control"); +const char wxControlNameStr[] = "control"; // ============================================================================ // implementation @@ -85,6 +86,13 @@ bool wxControlBase::CreateControl(wxWindowBase *parent, return true; } +/* static */ +wxString wxControlBase::GetLabelText(const wxString& label) +{ + // we don't want strip the TABs here, just the mnemonics + return wxStripMenuCodes(label, wxStrip_Mnemonics); +} + void wxControlBase::Command(wxCommandEvent& event) { (void)GetEventHandler()->ProcessEvent(event); @@ -112,13 +120,6 @@ void wxControlBase::InitCommandEvent(wxCommandEvent& event) const } } - -void wxControlBase::SetLabel( const wxString &label ) -{ - InvalidateBestSize(); - wxWindow::SetLabel(label); -} - bool wxControlBase::SetFont(const wxFont& font) { InvalidateBestSize(); @@ -151,6 +152,18 @@ void wxControlBase::DoUpdateWindowUI(wxUpdateUIEvent& event) #endif // wxUSE_RADIOBTN } +/* static */ +wxString wxControlBase::RemoveMnemonics(const wxString& str) +{ + return wxStripMenuCodes(str, wxStrip_Mnemonics); +} + +wxBorder wxControlBase::GetDefaultBorder() const +{ + return wxBORDER_THEME; +} + + // ---------------------------------------------------------------------------- // wxStaticBitmap // ----------------------------------------------------------------------------