Themes crash fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 65558e45ab2de5aab5f2436265fee62c3ab00475..b9df8d107bb77758d899507422e553f9e2b61ee3 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2983,7 +2983,7 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
 
 GtkStyle *wxWindow::GetWidgetStyle()
 {
-    if (m_widgetStyle) gtk_style_unref( m_widgetStyle );
+    if (m_widgetStyle) return m_widgetStyle;
 
     GtkStyle *def = gtk_rc_get_style( m_widget );
 
@@ -2991,7 +2991,6 @@ GtkStyle *wxWindow::GetWidgetStyle()
         def = gtk_widget_get_default_style();
 
     m_widgetStyle = gtk_style_copy( def );
-    m_widgetStyle->engine_data = def->engine_data;
     m_widgetStyle->klass = def->klass;
 
     return m_widgetStyle;

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 65558e45ab2de5aab5f2436265fee62c3ab00475..b9df8d107bb77758d899507422e553f9e2b61ee3 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2983,7 +2983,7 @@ bool wxWindow::SetForegroundColour( const wxColour &colour )
 
 GtkStyle *wxWindow::GetWidgetStyle()
 {
-    if (m_widgetStyle) gtk_style_unref( m_widgetStyle );
+    if (m_widgetStyle) return m_widgetStyle;
 
     GtkStyle *def = gtk_rc_get_style( m_widget );
 
@@ -2991,7 +2991,6 @@ GtkStyle *wxWindow::GetWidgetStyle()
         def = gtk_widget_get_default_style();
 
     m_widgetStyle = gtk_style_copy( def );
-    m_widgetStyle->engine_data = def->engine_data;
     m_widgetStyle->klass = def->klass;
 
     return m_widgetStyle;