drawing optimization fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 6c939ef83c215d15108088afa1b0fc0f8b539a0a..e541ef218164724eb1999bef54b55ac859471983 100644 (file)
--- 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 58232ab959d6a0d4cec5ce0d779c5bc060f51fd5..4b5197c1e37c49b294251bcd5b17b08d58782bc5 100644 (file)
--- 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 6c939ef83c215d15108088afa1b0fc0f8b539a0a..e541ef218164724eb1999bef54b55ac859471983 100644 (file)
--- 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 58232ab959d6a0d4cec5ce0d779c5bc060f51fd5..4b5197c1e37c49b294251bcd5b17b08d58782bc5 100644 (file)
--- 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() );