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

On wxGTK2 the label woudl not be realigned if SetLabel was called with

Browse Source 
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
This commit is contained in:
Robin Dunn
2004-06-02 20:26:49 +00:00
parent fe3d568d3d
commit b2fcfd94d3
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/button.cpp
View File

@@ -108,7 +108,11 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
wxControl::SetLabel( label ); wxControl::SetLabel( label );
*/ */
#ifdef __WXGTK20__
m_widget = gtk_button_new_with_mnemonic("");
#else
m_widget = gtk_button_new_with_label(""); m_widget = gtk_button_new_with_label("");
#endif
float x_alignment = 0.5; float x_alignment = 0.5;
if (HasFlag(wxBU_LEFT)) if (HasFlag(wxBU_LEFT))
@@ -167,7 +171,7 @@ void wxButton::SetLabel( const wxString &label )
#ifdef __WXGTK20__ #ifdef __WXGTK20__
wxString label2 = PrepareLabelMnemonics( label ); 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 #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 #endif

6
src/gtk1/button.cpp
View File

@@ -108,7 +108,11 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label,
wxControl::SetLabel( label ); wxControl::SetLabel( label );
*/ */
#ifdef __WXGTK20__
m_widget = gtk_button_new_with_mnemonic("");
#else
m_widget = gtk_button_new_with_label(""); m_widget = gtk_button_new_with_label("");
#endif
float x_alignment = 0.5; float x_alignment = 0.5;
if (HasFlag(wxBU_LEFT)) if (HasFlag(wxBU_LEFT))
@@ -167,7 +171,7 @@ void wxButton::SetLabel( const wxString &label )
#ifdef __WXGTK20__ #ifdef __WXGTK20__
wxString label2 = PrepareLabelMnemonics( label ); 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 #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 #endif