From d411c5d6111551b36a6d7f0a3a991e42d26d54c3 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 24 Dec 2005 02:21:00 +0000 Subject: [PATCH] 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 --- src/gtk/control.cpp | 4 ++++ src/gtk1/control.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index ee15a56961..d339e25aeb 100644 --- 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 ee15a56961..d339e25aeb 100644 --- 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 } // ---------------------------------------------------------------------------- -- 2.50.0