X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d02852036df240b17f3164a940383502829435a4..345ff9c65b3ef17709785708b224dfcbf5135583:/src/gtk/toplevel.cpp

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index a8a2b2bba1..b6915adb51 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -662,7 +662,7 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 
     if (m_grabbed)
     {
-        wxFAIL_MSG(_T("Window still grabbed"));
+        wxFAIL_MSG(wxT("Window still grabbed"));
         RemoveGrab();
     }
 
@@ -780,9 +780,11 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long)
 void wxTopLevelWindowGTK::Refresh( bool WXUNUSED(eraseBackground), const wxRect *WXUNUSED(rect) )
 {
     wxCHECK_RET( m_widget, wxT("invalid frame") );
-    
-   gtk_widget_queue_draw( m_widget );
-   gdk_window_invalidate_rect( m_wxwindow->window, NULL, TRUE );
+
+    gtk_widget_queue_draw( m_widget );
+
+    if (m_wxwindow && m_wxwindow->window)
+        gdk_window_invalidate_rect( m_wxwindow->window, NULL, TRUE );
 }
 
 bool wxTopLevelWindowGTK::Show( bool show )
@@ -1228,7 +1230,7 @@ static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region)
 bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
 {
     wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
-                 _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
+                 wxT("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
     if ( GTK_WIDGET_REALIZED(m_widget) )
     {