SetLabel() no longer invalidates the font which
was previously set. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -234,6 +234,9 @@ void wxButton::SetLabel( const wxString &lbl )
|
|||||||
wxString label2 = PrepareLabelMnemonics(label);
|
wxString label2 = PrepareLabelMnemonics(label);
|
||||||
gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2));
|
gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2));
|
||||||
gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
|
gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
|
||||||
|
|
||||||
|
ApplyWidgetStyle( false );
|
||||||
|
|
||||||
#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
|
||||||
|
@@ -234,6 +234,9 @@ void wxButton::SetLabel( const wxString &lbl )
|
|||||||
wxString label2 = PrepareLabelMnemonics(label);
|
wxString label2 = PrepareLabelMnemonics(label);
|
||||||
gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2));
|
gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2));
|
||||||
gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
|
gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
|
||||||
|
|
||||||
|
ApplyWidgetStyle( false );
|
||||||
|
|
||||||
#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
|
||||||
|
Reference in New Issue
Block a user