X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/170acdc90e9f92f8b8120fa6c04acdbf45c89582..4a03bf0918353d397d8be851ad29fbb6ad22e0a1:/src/gtk/control.cpp diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index f940e07bdb..7369e8cd9e 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -22,6 +22,9 @@ #include "wx/fontutil.h" #include "wx/gtk/private.h" +#include "wx/private/stattext.h" + + // ============================================================================ // wxControl implementation // ============================================================================ @@ -34,7 +37,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow) wxControl::wxControl() { - m_needParent = true; } bool wxControl::Create( wxWindow *parent, @@ -89,29 +91,21 @@ void wxControl::PostCreation(const wxSize& size) // wxControl dealing with labels // ---------------------------------------------------------------------------- -void wxControl::SetLabel( const wxString &label ) +void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label) { - // keep the original string internally to be able to return it later (for - // consistency with the other ports) - m_label = label; + // save the original label + wxControlBase::SetLabel(label); - InvalidateBestSize(); + const wxString labelGTK = GTKConvertMnemonics(label); + gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK)); } -wxString wxControl::GetLabel() const +void wxControl::GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label) { - return m_label; + const wxString labelGTK = GTKConvertMnemonicsWithMarkup(label); + gtk_label_set_markup_with_mnemonic(w, wxGTK_CONV(labelGTK)); } -void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label) -{ - // don't call the virtual function which might call this one back again - wxControl::SetLabel(label); - - const wxString labelGTK = GTKConvertMnemonics(label); - - gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK)); -} // ---------------------------------------------------------------------------- // GtkFrame helpers @@ -130,8 +124,8 @@ GtkWidget* wxControl::GTKCreateFrame(const wxString& label) GtkWidget* framewidget = gtk_frame_new(NULL); gtk_frame_set_label_widget(GTK_FRAME(framewidget), labelwidget); - return framewidget; //note that the label is already set so you'll - //only need to call wxControl::SetLabel afterwards + return framewidget; // note that the label is already set so you'll + // only need to call wxControl::SetLabel afterwards } void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label) @@ -154,49 +148,75 @@ void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget) } // ---------------------------------------------------------------------------- -// worker function implementing both GTKConvert/RemoveMnemonics() -// -// notice that under GTK+ 1 we only really need to support MNEMONICS_REMOVE as -// it doesn't support mnemonics anyhow but this would make the code so ugly -// that we do the same thing for GKT+ 1 and 2 +// worker function implementing GTK*Mnemonics() functions // ---------------------------------------------------------------------------- enum MnemonicsFlag { MNEMONICS_REMOVE, - MNEMONICS_CONVERT + MNEMONICS_CONVERT, + MNEMONICS_CONVERT_MARKUP }; static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag) { - const size_t len = label.length(); wxString labelGTK; - labelGTK.reserve(len); - for ( size_t i = 0; i < len; i++ ) + labelGTK.reserve(label.length()); + for ( wxString::const_iterator i = label.begin(); i != label.end(); ++i ) { - wxChar ch = label[i]; + wxChar ch = *i; switch ( ch ) { case wxT('&'): - if ( i == len - 1 ) + if ( i + 1 == label.end() ) { // "&" at the end of string is an error - wxLogDebug(wxT("Invalid label \"%s\"."), label.c_str()); + wxLogDebug(wxT("Invalid label \"%s\"."), label); break; } - ch = label[++i]; // skip '&' itself + if ( flag == MNEMONICS_CONVERT_MARKUP ) + { + bool isMnemonic = true; + size_t distanceFromEnd = label.end() - i; + + // 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 (distanceFromEnd >= entityLen && + wxString(i, i + entityLen) == entity) + { + labelGTK << entity; + i += entityLen - 1; // the -1 is because main for() + // loop already increments i + isMnemonic = false; + + break; + } + } + + if (!isMnemonic) + continue; + } + + ch = *(++i); // skip '&' itself switch ( ch ) { case wxT('&'): // special case: "&&" is not a mnemonic at all but just // an escaped "&" - labelGTK += wxT('&'); + if ( flag == MNEMONICS_CONVERT_MARKUP ) + labelGTK += wxT("&"); + else + labelGTK += wxT('&'); break; case wxT('_'): - if ( flag == MNEMONICS_CONVERT ) + if ( flag != MNEMONICS_REMOVE ) { // '_' can't be a GTK mnemonic apparently so // replace it with something similar @@ -206,14 +226,14 @@ static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag) //else: fall through default: - if ( flag == MNEMONICS_CONVERT ) + if ( flag != MNEMONICS_REMOVE ) labelGTK += wxT('_'); labelGTK += ch; } break; case wxT('_'): - if ( flag == MNEMONICS_CONVERT ) + if ( flag != MNEMONICS_REMOVE ) { // escape any existing underlines in the string so that // they don't become mnemonics accidentally @@ -242,6 +262,12 @@ wxString wxControl::GTKConvertMnemonics(const wxString& label) return GTKProcessMnemonics(label, MNEMONICS_CONVERT); } +/* static */ +wxString wxControl::GTKConvertMnemonicsWithMarkup(const wxString& label) +{ + return GTKProcessMnemonics(label, MNEMONICS_CONVERT_MARKUP); +} + // ---------------------------------------------------------------------------- // wxControl styles (a.k.a. attributes) // ---------------------------------------------------------------------------- @@ -252,9 +278,6 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const UseGTKStyleBase()); } - -#define SHIFT (8*(sizeof(short int)-sizeof(char))) - // static wxVisualAttributes wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, @@ -277,17 +300,11 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, state = GTK_STATE_NORMAL; // get the style's colours - attr.colFg = wxColour(style->fg[state].red >> SHIFT, - style->fg[state].green >> SHIFT, - style->fg[state].blue >> SHIFT); + attr.colFg = wxColour(style->fg[state]); if (useBase) - attr.colBg = wxColour(style->base[state].red >> SHIFT, - style->base[state].green >> SHIFT, - style->base[state].blue >> SHIFT); + attr.colBg = wxColour(style->base[state]); else - attr.colBg = wxColour(style->bg[state].red >> SHIFT, - style->bg[state].green >> SHIFT, - style->bg[state].blue >> SHIFT); + attr.colBg = wxColour(style->bg[state]); // get the style's font if ( !style->font_desc )