More for wxPython 2.0b9 (hopefully the last...)

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 8325a66859f2f52101ab2d8653ec617187191c11..004495d7baff0d8e850b3fdcc0e8641329a1a4f0 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -3045,6 +3045,8 @@ void wxWindow::SetFont( const wxFont &font )
     else
         m_font = *wxSWISS_FONT;
 
     else
         m_font = *wxSWISS_FONT;
 

+    if (!m_widget->window) return;
+

     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
     if (sysbg.Red() == m_backgroundColour.Red() &&
         sysbg.Green() == m_backgroundColour.Green() &&
     wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE );
     if (sysbg.Red() == m_backgroundColour.Red() &&
         sysbg.Green() == m_backgroundColour.Green() &&


@@ -3532,6 +3534,7 @@ bool wxWindow::Layout()
     GetSizer()->LayoutPhase1(&noChanges);
     GetSizer()->LayoutPhase2(&noChanges);
     GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes
     GetSizer()->LayoutPhase1(&noChanges);
     GetSizer()->LayoutPhase2(&noChanges);
     GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes

+    

     return TRUE;
   }
   else
     return TRUE;
   }
   else