From 4116bc7eddd2c77de35aa4297e7b8dc1394435f5 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Thu, 10 Jan 2013 07:17:01 +0000
Subject: [PATCH] call GTKApplyWidgetStyle() from PostCreation() instead of
 GTKHandleRealized() it's a better place to catch font or color changes made
 before creation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/control.cpp | 1 -
 src/gtk/menu.cpp    | 2 --
 src/gtk/window.cpp  | 5 +++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index dee13ff..705da6f 100644
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -105,7 +105,6 @@ void wxControl::PostCreation(const wxSize& size)
     gtk_widget_ensure_style(m_widget);
 #endif
 
-    GTKApplyWidgetStyle();
     SetInitialSize(size);
 }
 
diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 694c0d5..b1c72ad 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -101,8 +101,6 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
     }
 
     PostCreation();
-
-    GTKApplyWidgetStyle();
 #endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON && !wxUSE_LIBHILDON2
 
     g_object_ref_sink(m_widget);
diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 81d7995..3805f1b 100644
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2020,8 +2020,6 @@ void wxWindowGTK::GTKHandleRealized()
     }
 #endif
 
-    GTKApplyWidgetStyle();
-
     wxWindowCreateEvent event(static_cast<wxWindow*>(this));
     event.SetEventObject( this );
     GTKProcessEvent( event );
@@ -2582,6 +2580,9 @@ void wxWindowGTK::PostCreation()
     if (!WX_IS_PIZZA(gtk_widget_get_parent(m_widget)) && !GTK_IS_WINDOW(m_widget))
         gtk_widget_set_size_request(m_widget, m_width, m_height);
 
+    // apply any font or color changes made before creation
+    GTKApplyWidgetStyle();
+
     InheritAttributes();
 
     SetLayoutDirection(wxLayout_Default);
-- 
2.7.4