a tad bit more padding

[wxWidgets.git] / src / common / ctrlcmn.cpp

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index a0af638bcb9ef6b34c3f023882f36a6c6d9f286d..2bb9ab4520052522d7c1afc91d185da90d507412 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -31,14 +31,12 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/radiobut.h"
-#endif
-
-#if wxUSE_STATBMP
-    #include "wx/bitmap.h"
     #include "wx/statbmp.h"
-#endif // wxUSE_STATBMP
+    #include "wx/bitmap.h"
+    #include "wx/utils.h"       // for wxStripMenuCodes()
+#endif
 
-WXDLLIMPEXP_DATA_CORE(const wxChar) wxControlNameStr[] = wxT("control");
+const wxChar wxControlNameStr[] = wxT("control");
 
 // ============================================================================
 // implementation
@@ -88,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);