Corrected wxScrolledWindow's OnSize behaviour.

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

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index 5c11a0acf3e45e1b8ae50869f9b7207b021147e7..2c31667721a289500e07d11953029ee3461a2542 100644 (file)
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -351,6 +351,7 @@ bool wxRegion::Intersect( const wxRegion& region )
     }
 
     // we need to update the rect list as well
     }
 
     // we need to update the rect list as well

+#if OLDCODE

     wxList& list = *GetRectList();
     wxNode *node = list.First();
     while (node)
     wxList& list = *GetRectList();
     wxNode *node = list.First();
     while (node)


@@ -372,7 +373,7 @@ bool wxRegion::Intersect( const wxRegion& region )
 
         node = node->Next();
     }
 
         node = node->Next();
     }

-
+#endif

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -765,10 +766,8 @@ wxCoord wxRegionIterator::GetH() const
 wxRect wxRegionIterator::GetRect() const
 {
     wxRect r;
 wxRect wxRegionIterator::GetRect() const
 {
     wxRect r;

-    wxNode *node = m_region.GetRectList()->Nth( m_current );
-
-    if (node)
-        r = *((wxRect*)node->Data());
+    if( HaveRects() )
+        r = ((wxRIRefData*)m_refData)->m_rects[m_current];

 
     return r;
 }
 
     return r;
 }