From b2fcfd94d34b25233a0bf14f3ac388ae747bccb7 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 2 Jun 2004 20:26:49 +0000 Subject: [PATCH] On wxGTK2 the label woudl not be realigned if SetLabel was called with a new label. Changed it to use gtk_button_set_label so that the widget would care of doing it, and also to create with widget with gtk_button_new_with_mnemonic so the mnemonic behaviour would be preserved. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/button.cpp | 6 +++++- src/gtk1/button.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index 4638f0a6b1..f71214c940 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -108,7 +108,11 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, wxControl::SetLabel( label ); */ +#ifdef __WXGTK20__ + m_widget = gtk_button_new_with_mnemonic(""); +#else m_widget = gtk_button_new_with_label(""); +#endif float x_alignment = 0.5; if (HasFlag(wxBU_LEFT)) @@ -167,7 +171,7 @@ void wxButton::SetLabel( const wxString &label ) #ifdef __WXGTK20__ wxString label2 = PrepareLabelMnemonics( label ); - gtk_label_set_text_with_mnemonic( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( label2 ) ); + gtk_button_set_label( GTK_BUTTON(m_widget), wxGTK_CONV(label2) ); #else gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) ); #endif diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 4638f0a6b1..f71214c940 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -108,7 +108,11 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, wxControl::SetLabel( label ); */ +#ifdef __WXGTK20__ + m_widget = gtk_button_new_with_mnemonic(""); +#else m_widget = gtk_button_new_with_label(""); +#endif float x_alignment = 0.5; if (HasFlag(wxBU_LEFT)) @@ -167,7 +171,7 @@ void wxButton::SetLabel( const wxString &label ) #ifdef __WXGTK20__ wxString label2 = PrepareLabelMnemonics( label ); - gtk_label_set_text_with_mnemonic( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( label2 ) ); + gtk_button_set_label( GTK_BUTTON(m_widget), wxGTK_CONV(label2) ); #else gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) ); #endif -- 2.45.2