X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fa056ab78be920eacac56e51864fe7a45d1a31a..f5ba273ecd799f652736ce2bc830283787302a56:/src/gtk/dcclient.cpp

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 1dbaf55b39..a99a0791e7 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1452,14 +1452,23 @@ void wxWindowDC::SetPen( const wxPen &pen )
         {
             for (int i = 0; i < req_nb_dash; i++)
                 real_req_dash[i] = req_dash[i] * width;
+#if GTK_CHECK_VERSION(1,2,7)
             gdk_gc_set_dashes( m_penGC, 0, (gint8*) real_req_dash,
 			      req_nb_dash );
+#else
+            gdk_gc_set_dashes( m_penGC, 0, real_req_dash,
+			      req_nb_dash );
+#endif
             delete[] real_req_dash;
         }
         else
         {
             // No Memory. We use non-scaled dash pattern...
+#if GTK_CHECK_VERSION(1,2,7)
             gdk_gc_set_dashes( m_penGC, 0, (gint8*)req_dash, req_nb_dash );
+#else
+            gdk_gc_set_dashes( m_penGC, 0, (char*)req_dash, req_nb_dash );
+#endif
         }
     }
 #endif
@@ -2019,7 +2028,10 @@ wxPaintDC::wxPaintDC()
 wxPaintDC::wxPaintDC( wxWindow *win )
   : wxWindowDC( win )
 {
-#if USE_PAINT_REGION    
+#if USE_PAINT_REGION
+    if (!win->m_clipPaintRegion)
+        return;
+        
     m_paintClippingRegion = win->GetUpdateRegion();
     m_currentClippingRegion.Union( m_paintClippingRegion );