X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74639764d0076ce477ed3d69827061063f4b5e9a..84e455807ee62925c98e18d2848954125b128018:/src/common/ctrlcmn.cpp

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 2bb9ab4520..83f789b824 100644
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -36,7 +36,7 @@
     #include "wx/utils.h"       // for wxStripMenuCodes()
 #endif
 
-const wxChar wxControlNameStr[] = wxT("control");
+const char wxControlNameStr[] = "control";
 
 // ============================================================================
 // implementation
@@ -120,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();
@@ -159,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
 // ----------------------------------------------------------------------------