New wxWin.icc for monolithic build.

[wxWidgets.git] / src / gtk1 / window.cpp

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 65558e45ab2de5aab5f2436265fee62c3ab00475..623abc1151d41a5965f0bd5ad38f3170423e87ef 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -248,6 +248,8 @@ void debug_focus_in( GtkWidget* widget, const wxChar* name, const wxChar *window
     }
 }
 
+#else
+#define DEBUG_MAIN_THREAD
 #endif // Debug
 
 //-----------------------------------------------------------------------------
@@ -2983,7 +2985,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 +2993,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;