X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6728fb611b9812c9d72ebedf5c04ef242aedcd2d..fe77cf604a21504f06c1d667a64676af4b257c4c:/src/gtk1/window.cpp

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 4630c80600..392a1095f5 100644
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -509,6 +509,10 @@ static int gtk_window_expose_callback( GtkWidget *widget,
                                   gdk_event->area.y,
                                   gdk_event->area.width,
                                   gdk_event->area.height );
+    win->m_clearRegion.Union( gdk_event->area.x,
+                                  gdk_event->area.y,
+                                  gdk_event->area.width,
+                                  gdk_event->area.height );
 
     // Actual redrawing takes place in idle time.
     win->GtkUpdate();
@@ -3263,7 +3267,7 @@ void wxWindowGTK::SetFocus()
         }
     }
 
-    (void)DoSendFocusEvents(this);
+    (void)DoSendFocusEvents((wxWindow*)this);
 }
 
 bool wxWindowGTK::AcceptsFocus() const
@@ -3485,7 +3489,7 @@ void wxWindowGTK::GtkSendPaintEvents()
         while (parent && !parent->IsTopLevel())
             parent = parent->GetParent();
         if (!parent)
-            parent = this;
+            parent = (wxWindow*)this;
     
         wxRegionIterator upd( m_updateRegion );
         while (upd)
@@ -4241,7 +4245,6 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
         GetClientSize( &cw, &ch );
         m_clearRegion.Intersect( 0, 0, cw, ch );
     }
-
     m_clipPaintRegion = TRUE;
 
     gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy );