explicit scrollbar style flags needed

[wxWidgets.git] / src / gtk / button.cpp

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index f71214c940196885be711e0ffdc49fd33924c638..d42f359e199c257ffdf74300ed11dc15099802d4 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -196,11 +196,10 @@ bool wxButton::IsOwnGtkWindow( GdkWindow *window )
 #endif
 }
 
 #endif
 }
 

-void wxButton::ApplyWidgetStyle()
+void wxButton::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-    gtk_widget_set_style( BUTTON_CHILD(m_widget), m_widgetStyle );
+    gtk_widget_modify_style(m_widget, style);
+    gtk_widget_modify_style(BUTTON_CHILD(m_widget), style);

 }
 
 wxSize wxButton::DoGetBestSize() const
 }
 
 wxSize wxButton::DoGetBestSize() const


@@ -233,6 +232,7 @@ wxSize wxButton::DoGetBestSize() const
         if (ret.x < 80) ret.x = 80;
     }
 
         if (ret.x < 80) ret.x = 80;
     }
 

+    CacheBestSize(ret);

     return ret;
 }
 
     return ret;
 }