Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-07-23 15:59:55 +00:00
parent 9ec05cc986
commit 32c77a7133
6 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/button.cpp
View File

@@ -57,8 +57,8 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
PreCreation( parent, id, pos, newSize, style, name ); PreCreation( parent, id, pos, newSize, style, name );
m_label = label; SetLabel(label);
m_widget = gtk_button_new_with_label( 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.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
if (newSize.y == -1) newSize.y = 26; if (newSize.y == -1) newSize.y = 26;

13
src/gtk/control.cpp
View File

@@ -22,7 +22,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
wxControl::wxControl(void) wxControl::wxControl(void)
{ {
m_label = "";
m_needParent = TRUE; m_needParent = TRUE;
}; };
@@ -39,7 +38,17 @@ void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
void wxControl::SetLabel( const wxString &label ) 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 wxString wxControl::GetLabel(void) const

8
src/gtk/stattext.cpp
View File

@@ -42,7 +42,9 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
PreCreation( parent, id, pos, size, style, name ); 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; GtkJustification justify;
if ( style & wxALIGN_CENTER ) if ( style & wxALIGN_CENTER )
justify = GTK_JUSTIFY_CENTER; justify = GTK_JUSTIFY_CENTER;
@@ -73,5 +75,7 @@ wxString wxStaticText::GetLabel(void) const
void wxStaticText::SetLabel( const wxString &label ) 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 );
}; };

4
src/gtk1/button.cpp
View File

@@ -57,8 +57,8 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
PreCreation( parent, id, pos, newSize, style, name ); PreCreation( parent, id, pos, newSize, style, name );
m_label = label; SetLabel(label);
m_widget = gtk_button_new_with_label( 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.x == -1) newSize.x = 15+gdk_string_measure( m_widget->style->font, label );
if (newSize.y == -1) newSize.y = 26; if (newSize.y == -1) newSize.y = 26;

13
src/gtk1/control.cpp
View File

@@ -22,7 +22,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl,wxWindow)
wxControl::wxControl(void) wxControl::wxControl(void)
{ {
m_label = "";
m_needParent = TRUE; m_needParent = TRUE;
}; };
@@ -39,7 +38,17 @@ void wxControl::Command( wxCommandEvent &WXUNUSED(event) )
void wxControl::SetLabel( const wxString &label ) 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 wxString wxControl::GetLabel(void) const

8
src/gtk1/stattext.cpp
View File

@@ -42,7 +42,9 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
PreCreation( parent, id, pos, size, style, name ); 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; GtkJustification justify;
if ( style & wxALIGN_CENTER ) if ( style & wxALIGN_CENTER )
justify = GTK_JUSTIFY_CENTER; justify = GTK_JUSTIFY_CENTER;
@@ -73,5 +75,7 @@ wxString wxStaticText::GetLabel(void) const
void wxStaticText::SetLabel( const wxString &label ) 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 );
}; };