added support for GTK2 label mnemonics (patch #689573)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 9e5c3f4ee4379937e232fb73d381db077e9ca61d..58054505bacbbab53bb80899bbea4958b2ee7a1b 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -69,6 +69,7 @@ Unix:
 
 wxGTK:
 
 
 wxGTK:
 

+- added support for label mnemonics to GTK+2 build (Michael Moss)

 - added native wxMessageDialog implementation for GTK+2 build
 - fixed wxMenu::Remove (John Skiff and Benjamin Williams)
 - made wxTextCtrl::EmulateKeyPress() work for Delete and Backspace
 - added native wxMessageDialog implementation for GTK+2 build
 - fixed wxMenu::Remove (John Skiff and Benjamin Williams)
 - made wxTextCtrl::EmulateKeyPress() work for Delete and Backspace

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 38b59dcf29f301681d3b21215261a3a1baf95e18..17db76e5711942fd57da856cd3aff3f6a2351fda 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -55,6 +55,9 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

+#ifdef __WXGTK20__
+    wxString PrepareLabelMnemonics( const wxString &label ) const;
+#endif

 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 38b59dcf29f301681d3b21215261a3a1baf95e18..17db76e5711942fd57da856cd3aff3f6a2351fda 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -55,6 +55,9 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

+#ifdef __WXGTK20__
+    wxString PrepareLabelMnemonics( const wxString &label ) const;
+#endif

 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index fae04c137284c4431fd4643f205258b334e1f999..b61143a0ef7b5fd5dc0a1a43968810024e414c7d 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -175,7 +175,12 @@ void wxButton::SetLabel( const wxString &label )
 
     wxControl::SetLabel( label );
 
 
     wxControl::SetLabel( label );
 

+#ifdef __WXGTK20__
+    wxString label2 = PrepareLabelMnemonics( label );
+    gtk_label_set_text_with_mnemonic( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( label2 ) );
+#else

     gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );
     gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );

+#endif

 }
 
 bool wxButton::Enable( bool enable )
 }
 
 bool wxButton::Enable( bool enable )

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index 0916de575b12fde11c4ae13f3fe7c040b2cfe4aa..c49c46ccff7f50aa87145e35bf9fc261cfdbdab1 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -85,8 +85,6 @@ bool wxCheckBox::Create(wxWindow *parent,
         return FALSE;
     }
 
         return FALSE;
     }
 

-    wxControl::SetLabel( label );
-

     if ( style & wxALIGN_RIGHT )
     {
         // VZ: as I don't know a way to create a right aligned checkbox with
     if ( style & wxALIGN_RIGHT )
     {
         // VZ: as I don't know a way to create a right aligned checkbox with


@@ -94,7 +92,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         //     left of it
         m_widgetCheckbox = gtk_check_button_new();
 
         //     left of it
         m_widgetCheckbox = gtk_check_button_new();
 

-        m_widgetLabel = gtk_label_new( wxGTK_CONV( m_label ) );
+        m_widgetLabel = gtk_label_new("");

         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
         m_widget = gtk_hbox_new(FALSE, 0);
         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
         m_widget = gtk_hbox_new(FALSE, 0);


@@ -106,10 +104,11 @@ bool wxCheckBox::Create(wxWindow *parent,
     }
     else
     {
     }
     else
     {

-        m_widgetCheckbox = gtk_check_button_new_with_label( wxGTK_CONV( m_label ) );
+        m_widgetCheckbox = gtk_check_button_new_with_label("");

         m_widgetLabel = BUTTON_CHILD( m_widgetCheckbox );
         m_widget = m_widgetCheckbox;
     }
         m_widgetLabel = BUTTON_CHILD( m_widgetCheckbox );
         m_widget = m_widgetCheckbox;
     }

+    SetLabel( label );

 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
                         "clicked",
 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
                         "clicked",


@@ -166,7 +165,12 @@ void wxCheckBox::SetLabel( const wxString& label )
 
     wxControl::SetLabel( label );
 
 
     wxControl::SetLabel( label );
 

+#ifdef __WXGTK20__
+    wxString label2 = PrepareLabelMnemonics( label );
+    gtk_label_set_text_with_mnemonic( GTK_LABEL(m_widgetLabel), wxGTK_CONV( label2 ) );
+#else

     gtk_label_set( GTK_LABEL(m_widgetLabel), wxGTK_CONV( GetLabel() ) );
     gtk_label_set( GTK_LABEL(m_widgetLabel), wxGTK_CONV( GetLabel() ) );

+#endif

 }
 
 bool wxCheckBox::Enable( bool enable )
 }
 
 bool wxCheckBox::Enable( bool enable )

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 72e2da93ef4b857bc10f17ab66735f2cf17a6f3b..8801219ee3fa05160e9360fb8cab029c9687cf10 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -83,5 +83,47 @@ wxSize wxControl::DoGetBestSize() const
     return wxSize(req.width, req.height);
 }
 
     return wxSize(req.width, req.height);
 }
 

+wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const
+{
+    //Format mnemonics properly for GTK2. This can be called from GTK1.x, but
+    //it's not very useful because mnemonics don't exist prior to GTK2.
+    wxString label2;
+    for (size_t i = 0; i < label.Len(); i++)
+    {
+        if (label.GetChar(i) == wxT('&'))
+        {
+            //Mnemonic escape sequence "&&" is a literal "&" in the output.
+            if (label.GetChar(i + 1) == wxT('&'))
+            {
+                label2 << wxT('&');
+                i++;
+            }
+            //Handle special case of "&_" (i.e. "_" is the mnemonic).
+            //FIXME - Is it possible to use "_" as a GTK mnemonic? Just use a
+            //dash for now.
+            else if (label.GetChar(i + 1) == wxT('_'))
+            {
+                label2 << wxT("_-");
+                i++;
+            }
+            //Replace WX mnemonic indicator "&" with GTK indicator "_".
+            else
+            {
+                label2 << wxT('_');
+            }
+        }
+        else if (label.GetChar(i) == wxT('_'))
+        {
+            //Escape any underlines in the string so GTK doesn't use them.
+            label2 << wxT("__");
+        }
+        else
+        {
+            label2 << label.GetChar(i);
+        }
+    }
+    return label2;
+}
+

 #endif // wxUSE_CONTROLS
 
 #endif // wxUSE_CONTROLS
 

diff --git a/src/gtk/radiobut.cpp b/src/gtk/radiobut.cpp
index fad83bc1b1621e36a6e791dd30d480e04631ea6a..d22bf804c2544ad1608416276f55cbfd160c3ae8 100644 (file)
--- a/src/gtk/radiobut.cpp
+++ b/src/gtk/radiobut.cpp
@@ -154,7 +154,12 @@ void wxRadioButton::SetLabel( const wxString& label )
   
     wxControl::SetLabel( label );
     GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) );
   
     wxControl::SetLabel( label );
     GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) );

+#ifdef __WXGTK20__
+    wxString label2 = PrepareLabelMnemonics( label );
+    gtk_label_set_text_with_mnemonic( g_label, wxGTK_CONV( label2 ) );
+#else

     gtk_label_set( g_label, wxGTK_CONV( GetLabel() ) );
     gtk_label_set( g_label, wxGTK_CONV( GetLabel() ) );

+#endif

 }
 
 void wxRadioButton::SetValue( bool val )
 }
 
 void wxRadioButton::SetValue( bool val )

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index fae04c137284c4431fd4643f205258b334e1f999..b61143a0ef7b5fd5dc0a1a43968810024e414c7d 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -175,7 +175,12 @@ void wxButton::SetLabel( const wxString &label )
 
     wxControl::SetLabel( label );
 
 
     wxControl::SetLabel( label );
 

+#ifdef __WXGTK20__
+    wxString label2 = PrepareLabelMnemonics( label );
+    gtk_label_set_text_with_mnemonic( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( label2 ) );
+#else

     gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );
     gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) );

+#endif

 }
 
 bool wxButton::Enable( bool enable )
 }
 
 bool wxButton::Enable( bool enable )

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index 0916de575b12fde11c4ae13f3fe7c040b2cfe4aa..c49c46ccff7f50aa87145e35bf9fc261cfdbdab1 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -85,8 +85,6 @@ bool wxCheckBox::Create(wxWindow *parent,
         return FALSE;
     }
 
         return FALSE;
     }
 

-    wxControl::SetLabel( label );
-

     if ( style & wxALIGN_RIGHT )
     {
         // VZ: as I don't know a way to create a right aligned checkbox with
     if ( style & wxALIGN_RIGHT )
     {
         // VZ: as I don't know a way to create a right aligned checkbox with


@@ -94,7 +92,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         //     left of it
         m_widgetCheckbox = gtk_check_button_new();
 
         //     left of it
         m_widgetCheckbox = gtk_check_button_new();
 

-        m_widgetLabel = gtk_label_new( wxGTK_CONV( m_label ) );
+        m_widgetLabel = gtk_label_new("");

         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
         m_widget = gtk_hbox_new(FALSE, 0);
         gtk_misc_set_alignment(GTK_MISC(m_widgetLabel), 0.0, 0.5);
 
         m_widget = gtk_hbox_new(FALSE, 0);


@@ -106,10 +104,11 @@ bool wxCheckBox::Create(wxWindow *parent,
     }
     else
     {
     }
     else
     {

-        m_widgetCheckbox = gtk_check_button_new_with_label( wxGTK_CONV( m_label ) );
+        m_widgetCheckbox = gtk_check_button_new_with_label("");

         m_widgetLabel = BUTTON_CHILD( m_widgetCheckbox );
         m_widget = m_widgetCheckbox;
     }
         m_widgetLabel = BUTTON_CHILD( m_widgetCheckbox );
         m_widget = m_widgetCheckbox;
     }

+    SetLabel( label );

 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
                         "clicked",
 
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
                         "clicked",


@@ -166,7 +165,12 @@ void wxCheckBox::SetLabel( const wxString& label )
 
     wxControl::SetLabel( label );
 
 
     wxControl::SetLabel( label );
 

+#ifdef __WXGTK20__
+    wxString label2 = PrepareLabelMnemonics( label );
+    gtk_label_set_text_with_mnemonic( GTK_LABEL(m_widgetLabel), wxGTK_CONV( label2 ) );
+#else

     gtk_label_set( GTK_LABEL(m_widgetLabel), wxGTK_CONV( GetLabel() ) );
     gtk_label_set( GTK_LABEL(m_widgetLabel), wxGTK_CONV( GetLabel() ) );

+#endif

 }
 
 bool wxCheckBox::Enable( bool enable )
 }
 
 bool wxCheckBox::Enable( bool enable )

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index 72e2da93ef4b857bc10f17ab66735f2cf17a6f3b..8801219ee3fa05160e9360fb8cab029c9687cf10 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -83,5 +83,47 @@ wxSize wxControl::DoGetBestSize() const
     return wxSize(req.width, req.height);
 }
 
     return wxSize(req.width, req.height);
 }
 

+wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const
+{
+    //Format mnemonics properly for GTK2. This can be called from GTK1.x, but
+    //it's not very useful because mnemonics don't exist prior to GTK2.
+    wxString label2;
+    for (size_t i = 0; i < label.Len(); i++)
+    {
+        if (label.GetChar(i) == wxT('&'))
+        {
+            //Mnemonic escape sequence "&&" is a literal "&" in the output.
+            if (label.GetChar(i + 1) == wxT('&'))
+            {
+                label2 << wxT('&');
+                i++;
+            }
+            //Handle special case of "&_" (i.e. "_" is the mnemonic).
+            //FIXME - Is it possible to use "_" as a GTK mnemonic? Just use a
+            //dash for now.
+            else if (label.GetChar(i + 1) == wxT('_'))
+            {
+                label2 << wxT("_-");
+                i++;
+            }
+            //Replace WX mnemonic indicator "&" with GTK indicator "_".
+            else
+            {
+                label2 << wxT('_');
+            }
+        }
+        else if (label.GetChar(i) == wxT('_'))
+        {
+            //Escape any underlines in the string so GTK doesn't use them.
+            label2 << wxT("__");
+        }
+        else
+        {
+            label2 << label.GetChar(i);
+        }
+    }
+    return label2;
+}
+

 #endif // wxUSE_CONTROLS
 
 #endif // wxUSE_CONTROLS
 

diff --git a/src/gtk1/radiobut.cpp b/src/gtk1/radiobut.cpp
index fad83bc1b1621e36a6e791dd30d480e04631ea6a..d22bf804c2544ad1608416276f55cbfd160c3ae8 100644 (file)
--- a/src/gtk1/radiobut.cpp
+++ b/src/gtk1/radiobut.cpp
@@ -154,7 +154,12 @@ void wxRadioButton::SetLabel( const wxString& label )
   
     wxControl::SetLabel( label );
     GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) );
   
     wxControl::SetLabel( label );
     GtkLabel *g_label = GTK_LABEL( BUTTON_CHILD(m_widget) );

+#ifdef __WXGTK20__
+    wxString label2 = PrepareLabelMnemonics( label );
+    gtk_label_set_text_with_mnemonic( g_label, wxGTK_CONV( label2 ) );
+#else

     gtk_label_set( g_label, wxGTK_CONV( GetLabel() ) );
     gtk_label_set( g_label, wxGTK_CONV( GetLabel() ) );

+#endif

 }
 
 void wxRadioButton::SetValue( bool val )
 }
 
 void wxRadioButton::SetValue( bool val )