diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 6c939ef83c..e541ef2181 100644
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -364,10 +364,13 @@ void wxDC::ComputeScaleAndOrigin(void)
     // the pen has changed
       // Using this code, wxDC will ignore the new settings
       // so it's complete non-sense, Robert Roebling TODO!!
+        // It even gives an Assert, Robert Roebling
+/*	
     wxPen* pen = GetPen();
     wxPen tempPen;
     m_pen = tempPen;
     SetPen(pen);
+*/
   }
 }
 
diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 58232ab959..4b5197c1e3 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -117,7 +117,7 @@ wxPaintDC::wxPaintDC( wxWindow *window )
     SetUpDC();
     
     wxRegion update = window->GetUpdateRegion();
-    if (update == wxNullRegion) return;
+    if (update.Empty()) return;
     
     gdk_gc_set_clip_region( m_penGC, update.GetRegion() );
     gdk_gc_set_clip_region( m_brushGC, update.GetRegion() );
diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 6c939ef83c..e541ef2181 100644
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -364,10 +364,13 @@ void wxDC::ComputeScaleAndOrigin(void)
     // the pen has changed
       // Using this code, wxDC will ignore the new settings
       // so it's complete non-sense, Robert Roebling TODO!!
+        // It even gives an Assert, Robert Roebling
+/*	
     wxPen* pen = GetPen();
     wxPen tempPen;
     m_pen = tempPen;
     SetPen(pen);
+*/
   }
 }
 
diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 58232ab959..4b5197c1e3 100644
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -117,7 +117,7 @@ wxPaintDC::wxPaintDC( wxWindow *window )
     SetUpDC();
     
     wxRegion update = window->GetUpdateRegion();
-    if (update == wxNullRegion) return;
+    if (update.Empty()) return;
     
     gdk_gc_set_clip_region( m_penGC, update.GetRegion() );
     gdk_gc_set_clip_region( m_brushGC, update.GetRegion() );