removes "&" from wxControl's label (also for buttons and stattext)

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 9c167dc0fb02a758ab9d4aa8d0d2787002694809..2201232c15fe35fc7801b18f8b180c4d062281f7 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -41,39 +41,39 @@ wxButton::wxButton(void)
 };
 
 wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size, 
+      const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
   Create( parent, id, label, pos, size, style, name );
 };
 
 bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size, 
+      const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
   m_needParent = TRUE;
-  
+
   wxSize newSize = size;
 
   PreCreation( parent, id, pos, newSize, style, name );
-  
-  m_label = label;
-  m_widget = gtk_button_new_with_label( label );
-  
+
+  SetLabel(label);
+  m_widget = gtk_button_new_with_label( m_label );
+
   if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
   if (newSize.y == -1) newSize.y = 26;
   SetSize( newSize.x, newSize.y );
-  
-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
+
+  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
     GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
   PostCreation();
-  
+
   Show( TRUE );
-    
+
   return TRUE;
 };
-      
+
 void wxButton::SetDefault(void)
 {
 };

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index 237f37d89f01dbd865970a4e1a5bc3e9e9318ed0..3c7f89d95b8af92647bf133ba04f7b71d9a93bdd 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -22,12 +22,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
 
 wxControl::wxControl(void)
 {
-  m_label = "";
   m_needParent = TRUE;
 };
 
-wxControl::wxControl( wxWindow *parent, wxWindowID id, 
-      const wxPoint &pos, const wxSize &size, 
+wxControl::wxControl( wxWindow *parent, wxWindowID id,
+      const wxPoint &pos, const wxSize &size,
       long style, const wxString &name ) :
   wxWindow( parent, id, pos, size, style, name )
 {
@@ -39,7 +38,17 @@ void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
 
 void wxControl::SetLabel( const wxString &label )
 {
-  m_label = label;
+  for ( const char *pc = label; *pc != '\0'; pc++ ) {
+    if ( *pc == '&' ) {
+      pc++; // skip it
+#if 0 // it would be unused anyhow for now - kbd interface not done yet
+      if ( *pc != '&' )
+        m_chAccel = *pc;
+#endif
+    }
+
+    m_label << *pc;
+  }
 };
 
 wxString wxControl::GetLabel(void) const

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 752196f45593d56b528dbe340ef11e49b2265875..b125eeb11f7e152f29aeb16fe5a3b6189e2687fb 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -42,7 +42,9 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
   
   PreCreation( parent, id, pos, size, style, name );
   
-  m_widget = gtk_label_new( label );
+  wxControl::SetLabel(label);
+  m_widget = gtk_label_new( m_label );
+
   GtkJustification justify;
   if ( style & wxALIGN_CENTER )
     justify = GTK_JUSTIFY_CENTER;
@@ -73,5 +75,7 @@ wxString wxStaticText::GetLabel(void) const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
-  gtk_label_set( GTK_LABEL(m_widget), label );
+  wxControl::SetLabel(label);
+
+  gtk_label_set( GTK_LABEL(m_widget), m_label );
 };

diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp
index 9c167dc0fb02a758ab9d4aa8d0d2787002694809..2201232c15fe35fc7801b18f8b180c4d062281f7 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -41,39 +41,39 @@ wxButton::wxButton(void)
 };
 
 wxButton::wxButton( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size, 
+      const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
   Create( parent, id, label, pos, size, style, name );
 };
 
 bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos, const wxSize &size, 
+      const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
   m_needParent = TRUE;
-  
+
   wxSize newSize = size;
 
   PreCreation( parent, id, pos, newSize, style, name );
-  
-  m_label = label;
-  m_widget = gtk_button_new_with_label( label );
-  
+
+  SetLabel(label);
+  m_widget = gtk_button_new_with_label( m_label );
+
   if (newSize.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
   if (newSize.y == -1) newSize.y = 26;
   SetSize( newSize.x, newSize.y );
-  
-  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked", 
+
+  gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
     GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
   PostCreation();
-  
+
   Show( TRUE );
-    
+
   return TRUE;
 };
-      
+
 void wxButton::SetDefault(void)
 {
 };

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index 237f37d89f01dbd865970a4e1a5bc3e9e9318ed0..3c7f89d95b8af92647bf133ba04f7b71d9a93bdd 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -22,12 +22,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
 
 wxControl::wxControl(void)
 {
-  m_label = "";
   m_needParent = TRUE;
 };
 
-wxControl::wxControl( wxWindow *parent, wxWindowID id, 
-      const wxPoint &pos, const wxSize &size, 
+wxControl::wxControl( wxWindow *parent, wxWindowID id,
+      const wxPoint &pos, const wxSize &size,
       long style, const wxString &name ) :
   wxWindow( parent, id, pos, size, style, name )
 {
@@ -39,7 +38,17 @@ void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
 
 void wxControl::SetLabel( const wxString &label )
 {
-  m_label = label;
+  for ( const char *pc = label; *pc != '\0'; pc++ ) {
+    if ( *pc == '&' ) {
+      pc++; // skip it
+#if 0 // it would be unused anyhow for now - kbd interface not done yet
+      if ( *pc != '&' )
+        m_chAccel = *pc;
+#endif
+    }
+
+    m_label << *pc;
+  }
 };
 
 wxString wxControl::GetLabel(void) const

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 752196f45593d56b528dbe340ef11e49b2265875..b125eeb11f7e152f29aeb16fe5a3b6189e2687fb 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -42,7 +42,9 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
   
   PreCreation( parent, id, pos, size, style, name );
   
-  m_widget = gtk_label_new( label );
+  wxControl::SetLabel(label);
+  m_widget = gtk_label_new( m_label );
+
   GtkJustification justify;
   if ( style & wxALIGN_CENTER )
     justify = GTK_JUSTIFY_CENTER;
@@ -73,5 +75,7 @@ wxString wxStaticText::GetLabel(void) const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
-  gtk_label_set( GTK_LABEL(m_widget), label );
+  wxControl::SetLabel(label);
+
+  gtk_label_set( GTK_LABEL(m_widget), m_label );
 };