Added ability to switch off more components of the size page UI

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

diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index 73d983df890ae7a959bfeb94449fbe879a024976..fece55e9c5e9357e0ceeec86bc44efa420e60191 100644 (file)
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -165,7 +165,8 @@ void wxRegion::Clear()
 
 bool wxRegion::DoOffset(wxCoord x, wxCoord y)
 {
 
 bool wxRegion::DoOffset(wxCoord x, wxCoord y)
 {

-    wxCHECK_MSG( M_REGION, false, wxT("invalid wxRegion") );
+    const HRGN hrgn = GetHrgn();
+    wxCHECK_MSG( hrgn, false, wxT("invalid wxRegion") );

 
     if ( !x && !y )
     {
 
     if ( !x && !y )
     {


@@ -175,7 +176,7 @@ bool wxRegion::DoOffset(wxCoord x, wxCoord y)
 
     AllocExclusive();
 
 
     AllocExclusive();
 

-    if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR )
+    if ( ::OffsetRgn(hrgn, x, y) == ERROR )

     {
         wxLogLastError(wxT("OffsetRgn"));
 
     {
         wxLogLastError(wxT("OffsetRgn"));
 


@@ -384,12 +385,7 @@ void wxRegionIterator::Reset(const wxRegion& region)
     m_current = 0;
     m_region = region;
 
     m_current = 0;
     m_region = region;
 

-    if (m_rects)
-    {
-        delete[] m_rects;
-
-        m_rects = NULL;
-    }
+    wxDELETEA(m_rects);

 
     if (m_region.Empty())
         m_numRects = 0;
 
     if (m_region.Empty())
         m_numRects = 0;