'&' are removed from checkbox labels (all controls should call

wxControl::SetLabel and use m_label which contains the label without '&')

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

diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp
index f42ef1867dde9b8c92e785cda71a16a7d49da0fb..036a1dbcde9d883adfd76adc28ae3aac3f788cd5 100644 (file)
--- a/src/gtk/checkbox.cpp
+++ b/src/gtk/checkbox.cpp
@@ -56,7 +56,7 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
 
   SetLabel( label );
 
-  m_widget = gtk_check_button_new_with_label( label );
+  m_widget = gtk_check_button_new_with_label( m_label );
  
   wxSize newSize = size;
   if (newSize.x == -1) newSize.x = 25+gdk_string_measure( m_widget->style->font, label );

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index f42ef1867dde9b8c92e785cda71a16a7d49da0fb..036a1dbcde9d883adfd76adc28ae3aac3f788cd5 100644 (file)
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -56,7 +56,7 @@ bool wxCheckBox::Create(  wxWindow *parent, wxWindowID id, const wxString &label
 
   SetLabel( label );
 
-  m_widget = gtk_check_button_new_with_label( label );
+  m_widget = gtk_check_button_new_with_label( m_label );
  
   wxSize newSize = size;
   if (newSize.x == -1) newSize.x = 25+gdk_string_measure( m_widget->style->font, label );