X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/170acdc90e9f92f8b8120fa6c04acdbf45c89582..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/gtk/control.cpp

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index f940e07bdb..ea16fae76a 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -22,6 +22,8 @@
 #include "wx/fontutil.h"
 #include "wx/gtk/private.h"
 
+#include "wx/gtk/private/mnemonics.h"
+
 // ============================================================================
 // wxControl implementation
 // ============================================================================
@@ -34,7 +36,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow)
 
 wxControl::wxControl()
 {
-    m_needParent = true;
 }
 
 bool wxControl::Create( wxWindow *parent,
@@ -89,29 +90,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 +123,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,92 +147,25 @@ 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
-};
-
-static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag)
+/* static */
+wxString wxControl::GTKRemoveMnemonics(const wxString& label)
 {
-    const size_t len = label.length();
-    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.c_str());
-                    break;
-                }
-
-                ch = label[++i]; // skip '&' itself
-                switch ( ch )
-                {
-                    case wxT('&'):
-                        // special case: "&&" is not a mnemonic at all but just
-                        // an escaped "&"
-                        labelGTK += wxT('&');
-                        break;
-
-                    case wxT('_'):
-                        if ( flag == MNEMONICS_CONVERT )
-                        {
-                            // '_' can't be a GTK mnemonic apparently so
-                            // replace it with something similar
-                            labelGTK += wxT("_-");
-                            break;
-                        }
-                        //else: fall through
-
-                    default:
-                        if ( flag == MNEMONICS_CONVERT )
-                            labelGTK += wxT('_');
-                        labelGTK += ch;
-                }
-                break;
-
-            case wxT('_'):
-                if ( flag == MNEMONICS_CONVERT )
-                {
-                    // 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;
+    return wxGTKRemoveMnemonics(label);
 }
 
 /* static */
-wxString wxControl::GTKRemoveMnemonics(const wxString& label)
+wxString wxControl::GTKConvertMnemonics(const wxString& label)
 {
-    return GTKProcessMnemonics(label, MNEMONICS_REMOVE);
+    return wxConvertMnemonicsToGTK(label);
 }
 
 /* static */
-wxString wxControl::GTKConvertMnemonics(const wxString& label)
+wxString wxControl::GTKConvertMnemonicsWithMarkup(const wxString& label)
 {
-    return GTKProcessMnemonics(label, MNEMONICS_CONVERT);
+    return wxConvertMnemonicsToGTKMarkup(label);
 }
 
 // ----------------------------------------------------------------------------
@@ -252,9 +178,6 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const
                                              UseGTKStyleBase());
 }
 
-
-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
-
 // static
 wxVisualAttributes
 wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget,
@@ -277,17 +200,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 )