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 329f150d010e6615a371175aff332cac6c984add..fece55e9c5e9357e0ceeec86bc44efa420e60191 100644 (file)
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -72,7 +72,7 @@ public:
 
 private:
 // Cannot use
 
 private:
 // Cannot use

-//  DECLARE_NO_COPY_CLASS(wxRegionRefData)
+//  wxDECLARE_NO_COPY_CLASS(wxRegionRefData);

 // because copy constructor is explicitly declared above;
 // but no copy assignment operator is defined, so declare
 // it private to prevent the compiler from defining it:
 // because copy constructor is explicitly declared above;
 // but no copy assignment operator is defined, so declare
 // it private to prevent the compiler from defining it:


@@ -92,7 +92,7 @@ private:
 
 wxRegion::wxRegion()
 {
 
 wxRegion::wxRegion()
 {

-    m_refData = (wxRegionRefData *)NULL;
+    m_refData = NULL;

 }
 
 wxRegion::wxRegion(WXHRGN hRegion)
 }
 
 wxRegion::wxRegion(WXHRGN hRegion)


@@ -119,7 +119,7 @@ wxRegion::wxRegion(const wxRect& rect)
     M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
 }
 
     M_REGION = ::CreateRectRgn(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height);
 }
 

-wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
+wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)

 {
 #if defined(__WXMICROWIN__) || defined(__WXWINCE__)
     wxUnusedVar(n);
 {
 #if defined(__WXMICROWIN__) || defined(__WXWINCE__)
     wxUnusedVar(n);


@@ -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, _T("invalid wxRegion") );
+    const HRGN hrgn = GetHrgn();
+    wxCHECK_MSG( hrgn, false, wxT("invalid wxRegion") );

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


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

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

     {
     {

-        wxLogLastError(_T("OffsetRgn"));
+        wxLogLastError(wxT("OffsetRgn"));

 
         return false;
     }
 
         return false;
     }


@@ -202,7 +203,7 @@ bool wxRegion::DoCombine(const wxRegion& rgn, wxRegionOp op)
                 break;
 
             default:
                 break;
 
             default:

-                wxFAIL_MSG( _T("unknown region operation") );
+                wxFAIL_MSG( wxT("unknown region operation") );

                 // fall through
 
             case wxRGN_AND:
                 // fall through
 
             case wxRGN_AND:


@@ -235,7 +236,7 @@ bool wxRegion::DoCombine(const wxRegion& rgn, wxRegionOp op)
                 break;
 
             default:
                 break;
 
             default:

-                wxFAIL_MSG( _T("unknown region operation") );
+                wxFAIL_MSG( wxT("unknown region operation") );

                 // fall through
 
             case wxRGN_COPY:
                 // fall through
 
             case wxRGN_COPY:


@@ -245,7 +246,7 @@ bool wxRegion::DoCombine(const wxRegion& rgn, wxRegionOp op)
 
         if ( ::CombineRgn(M_REGION, M_REGION, M_REGION_OF(rgn), mode) == ERROR )
         {
 
         if ( ::CombineRgn(M_REGION, M_REGION, M_REGION_OF(rgn), mode) == ERROR )
         {

-            wxLogLastError(_T("CombineRgn"));
+            wxLogLastError(wxT("CombineRgn"));

 
             return false;
         }
 
             return false;
         }


@@ -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;


@@ -441,28 +437,28 @@ wxRegionIterator wxRegionIterator::operator ++ (int)
 
 wxCoord wxRegionIterator::GetX() const
 {
 
 wxCoord wxRegionIterator::GetX() const
 {

-    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );

 
     return m_rects[m_current].x;
 }
 
 wxCoord wxRegionIterator::GetY() const
 {
 
     return m_rects[m_current].x;
 }
 
 wxCoord wxRegionIterator::GetY() const
 {

-    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );

 
     return m_rects[m_current].y;
 }
 
 wxCoord wxRegionIterator::GetW() const
 {
 
     return m_rects[m_current].y;
 }
 
 wxCoord wxRegionIterator::GetW() const
 {

-    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );

 
     return m_rects[m_current].width;
 }
 
 wxCoord wxRegionIterator::GetH() const
 {
 
     return m_rects[m_current].width;
 }
 
 wxCoord wxRegionIterator::GetH() const
 {

-    wxCHECK_MSG( m_current < m_numRects, 0, _T("invalid wxRegionIterator") );
+    wxCHECK_MSG( m_current < m_numRects, 0, wxT("invalid wxRegionIterator") );

 
     return m_rects[m_current].height;
 }
 
     return m_rects[m_current].height;
 }