don't use deprecated wxMenuItem methods

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

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 9f6df5c86fb20a5dabf1d1cae76102251b467186..1a026c4e394453fc0d477fa4a80ea719154005cf 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -31,12 +31,10 @@
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/radiobut.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/radiobut.h"

-#endif
-
-#if wxUSE_STATBMP
-    #include "wx/bitmap.h"

     #include "wx/statbmp.h"
     #include "wx/statbmp.h"

-#endif // wxUSE_STATBMP
+    #include "wx/bitmap.h"
+    #include "wx/utils.h"       // for wxStripMenuCodes()
+#endif

 
 const wxChar wxControlNameStr[] = wxT("control");
 
 
 const wxChar wxControlNameStr[] = wxT("control");
 


@@ -88,6 +86,13 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
     return true;
 }
 
     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);
 void wxControlBase::Command(wxCommandEvent& event)
 {
     (void)GetEventHandler()->ProcessEvent(event);


@@ -115,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();
 bool wxControlBase::SetFont(const wxFont& font)
 {
     InvalidateBestSize();


@@ -154,6 +152,12 @@ void wxControlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
 #endif // wxUSE_RADIOBTN
 }
 
 #endif // wxUSE_RADIOBTN
 }
 

+/* static */
+wxString wxControlBase::RemoveMnemonics(const wxString& str)
+{
+    return wxStripMenuCodes(str, wxStrip_Mnemonics);
+}
+

 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------