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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 640ba4139c3ef2032fddb51b73442950c07eb24f..a4cf62371adcbeac5a733612647badd77277c93f 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -234,6 +234,9 @@ void wxButton::SetLabel( const wxString &lbl )
     wxString label2 = PrepareLabelMnemonics(label);
     gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2));
     gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
+    
+    ApplyWidgetStyle( false );
+    
 #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 640ba4139c3ef2032fddb51b73442950c07eb24f..a4cf62371adcbeac5a733612647badd77277c93f 100644 (file)
--- a/src/gtk1/button.cpp
+++ b/src/gtk1/button.cpp
@@ -234,6 +234,9 @@ void wxButton::SetLabel( const wxString &lbl )
     wxString label2 = PrepareLabelMnemonics(label);
     gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2));
     gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE);
+    
+    ApplyWidgetStyle( false );
+    
 #else
     gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(GetLabel()));
 #endif