X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8375af8ff97a3649361b988a40b991a8cdaab09..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/control.cpp?ds=inline diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index f839ce7e45..ea16fae76a 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -22,8 +22,7 @@ #include "wx/fontutil.h" #include "wx/gtk/private.h" -#include "wx/private/stattext.h" - +#include "wx/gtk/private/mnemonics.h" // ============================================================================ // wxControl implementation @@ -151,121 +150,22 @@ void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget) // worker function implementing GTK*Mnemonics() functions // ---------------------------------------------------------------------------- -enum MnemonicsFlag -{ - MNEMONICS_REMOVE, - MNEMONICS_CONVERT, - MNEMONICS_CONVERT_MARKUP -}; - -static wxString GTKProcessMnemonics(const wxChar* label, MnemonicsFlag flag) -{ - const size_t len = wxStrlen(label); - wxString labelGTK; - labelGTK.reserve(len); - for ( size_t i = 0; i < len; i++ ) - { - wxChar ch = label[i]; - - switch ( ch ) - { - case wxT('&'): - if ( i == len - 1 ) - { - // "&" at the end of string is an error - wxLogDebug(wxT("Invalid label \"%s\"."), label); - break; - } - - if ( flag == MNEMONICS_CONVERT_MARKUP ) - { - bool isMnemonic = true; - - // is this ampersand introducing a mnemonic or rather an entity? - for (size_t j=0; j < wxMARKUP_ENTITY_MAX; j++) - { - const wxChar *entity = wxMarkupEntities[wxMARKUP_ELEMENT_NAME][j]; - size_t entityLen = wxStrlen(entity); - - if (len - i >= entityLen && - wxStrncmp(entity, &label[i], entityLen) == 0) - { - labelGTK << entity; - i += entityLen - 1; // the -1 is because main for() - // loop already increments i - isMnemonic = false; - - break; - } - } - - if (!isMnemonic) - continue; - } - - ch = label[++i]; // skip '&' itself - switch ( ch ) - { - case wxT('&'): - // special case: "&&" is not a mnemonic at all but just - // an escaped "&" - if ( flag == MNEMONICS_CONVERT_MARKUP ) - labelGTK += wxT("&"); - else - labelGTK += wxT('&'); - break; - - case wxT('_'): - if ( flag != MNEMONICS_REMOVE ) - { - // '_' can't be a GTK mnemonic apparently so - // replace it with something similar - labelGTK += wxT("_-"); - break; - } - //else: fall through - - default: - if ( flag != MNEMONICS_REMOVE ) - labelGTK += wxT('_'); - labelGTK += ch; - } - break; - - case wxT('_'): - if ( flag != MNEMONICS_REMOVE ) - { - // escape any existing underlines in the string so that - // they don't become mnemonics accidentally - labelGTK += wxT("__"); - break; - } - //else: fall through - - default: - labelGTK += ch; - } - } - - return labelGTK; -} - /* static */ wxString wxControl::GTKRemoveMnemonics(const wxString& label) { - return GTKProcessMnemonics(label, MNEMONICS_REMOVE); + return wxGTKRemoveMnemonics(label); } /* static */ wxString wxControl::GTKConvertMnemonics(const wxString& label) { - return GTKProcessMnemonics(label, MNEMONICS_CONVERT); + return wxConvertMnemonicsToGTK(label); } /* static */ wxString wxControl::GTKConvertMnemonicsWithMarkup(const wxString& label) { - return GTKProcessMnemonics(label, MNEMONICS_CONVERT_MARKUP); + return wxConvertMnemonicsToGTKMarkup(label); } // ----------------------------------------------------------------------------