X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8e045e24bb7f37af742fe6afb4a454fc900bfe5..dc302518e6bf48326d202475bf78874fedcb2d9c:/src/gtk/window.cpp

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 045dbfc9fa..33085d03c9 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1534,8 +1534,8 @@ static gint gtk_window_button_press_callback( GtkWidget *widget,
 
     wxEventType event_type = wxEVT_NULL;
 
-    // GdkDisplay is a GTK+ 2.1.0 thing
-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
+    // GdkDisplay is a GTK+ 2.2.0 thing
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 2, 0)
     if ( gdk_event->type == GDK_2BUTTON_PRESS &&
             gdk_event->button >= 1 && gdk_event->button <= 3 )
     {
@@ -4024,15 +4024,15 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
 {
     // do we need to apply any changes at all?
     if ( !forceStyle &&
-         !m_hasFont && !m_hasFgCol &&
-         (!m_hasBgCol || !m_backgroundColour.Ok()) )
+         !m_font.Ok() &&
+         !m_foregroundColour.Ok() && !m_backgroundColour.Ok() )
     {
         return NULL;
     }
 
     GtkRcStyle *style = gtk_rc_style_new();
 
-    if ( m_hasFont )
+    if ( m_font.Ok() )
     {
 #ifdef __WXGTK20__
         style->font_desc = 
@@ -4043,7 +4043,7 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
 #endif
     }
 
-    if ( m_hasFgCol )
+    if ( m_foregroundColour.Ok() )
     {
         GdkColor *fg = m_foregroundColour.GetColor();
         
@@ -4057,7 +4057,7 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
         style->color_flags[GTK_STATE_ACTIVE] = GTK_RC_FG;
     }
 
-    if ( m_hasBgCol )
+    if ( m_backgroundColour.Ok() )
     {
         GdkColor *bg = m_backgroundColour.GetColor();
 
@@ -4090,15 +4090,21 @@ void wxWindowGTK::ApplyWidgetStyle(bool forceStyle)
     GtkRcStyle *style = CreateWidgetStyle(forceStyle);
     if ( style )
     {
-        if (m_wxwindow)
-            // should we also do m_widget in this case?
-            gtk_widget_modify_style(m_wxwindow, style);
-        else
-            gtk_widget_modify_style(m_widget, style);
+        DoApplyWidgetStyle(style);
         gtk_rc_style_unref(style);
     }
 }
 
+void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
+{
+    if (m_wxwindow)
+        // should we also do m_widget in this case?
+        gtk_widget_modify_style(m_wxwindow, style);
+    else
+        gtk_widget_modify_style(m_widget, style);
+}
+
+
 //-----------------------------------------------------------------------------
 // Pop-up menu stuff
 //-----------------------------------------------------------------------------