From 19ac2f446a7f2aa76e451b628b151bed42f7075a Mon Sep 17 00:00:00 2001 From: Robert Roebling <robert@roebling.de> Date: Sun, 27 Feb 2005 16:35:30 +0000 Subject: [PATCH] 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 --- src/gtk/button.cpp | 3 +++ src/gtk1/button.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index 640ba4139c..a4cf62371a 100644 --- 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 640ba4139c..a4cf62371a 100644 --- 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 -- 2.47.2