fixed labels under GTK+ 1 after recent changes (remove underscores from them again)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index ee15a56961bf9c3d71b2cbaa1e11702452e8ec6b..d339e25aeb5122ad2c6738eccdfa9b3b0f88c241 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -208,7 +208,11 @@ wxString wxControl::GTKRemoveMnemonics(const wxString& label)
 /* static */
 wxString wxControl::GTKConvertMnemonics(const wxString& label)
 {
+#ifdef __WXGTK20__
     return GTKProcessMnemonics(label, MNEMONICS_CONVERT);
+#else
+    return GTKRemoveMnemonics(label);
+#endif
 }
 
 // ----------------------------------------------------------------------------

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index ee15a56961bf9c3d71b2cbaa1e11702452e8ec6b..d339e25aeb5122ad2c6738eccdfa9b3b0f88c241 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -208,7 +208,11 @@ wxString wxControl::GTKRemoveMnemonics(const wxString& label)
 /* static */
 wxString wxControl::GTKConvertMnemonics(const wxString& label)
 {
+#ifdef __WXGTK20__
     return GTKProcessMnemonics(label, MNEMONICS_CONVERT);
+#else
+    return GTKRemoveMnemonics(label);
+#endif
 }
 
 // ----------------------------------------------------------------------------