1. wxGridCellEditor::SetSize needs to use the wxSIZE_ALLOW_MINUS_ONE

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

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 805201a26c6fc6ce9522d953aa3b5b88af599b60..47eefa20ddadf5a78757c40aafc66c3bb16aa9c8 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -612,9 +612,6 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
 {
     DEBUG_MAIN_THREAD
 
-    if (!win->m_hasVMT)
-        return;
-
 /*
     if (win->GetName() == wxT("columntitles"))
     {
@@ -637,6 +634,9 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp
     if (gdk_event->count > 0)
         return;
 
+    if (!win->m_hasVMT)
+        return;
+
     wxEraseEvent eevent( win->GetId() );
     eevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent(eevent);
@@ -659,9 +659,12 @@ static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget),
 
     if (g_isIdle)
         wxapp_install_idle_handler();
+        
+    if ((rect->x == 0) && (rect->y == 0) && (rect->width <= 1) && (rect->height <= 1))
+        return;
 
 /*
-    if ((win->GetName() == wxT("columntitles")) && (rect->x == 2))
+    if (win->GetName() == wxT("columntitles"))
     {
         wxPrintf( wxT("OnDraw from ") );
         if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
@@ -676,6 +679,9 @@ static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget),
     win->GetUpdateRegion().Union( rect->x, rect->y,
                                   rect->width, rect->height );
 
+    if (!win->m_hasVMT)
+        return;
+
     wxEraseEvent eevent( win->GetId() );
     eevent.SetEventObject( win );
     win->GetEventHandler()->ProcessEvent(eevent);