correct GetBestSize() to return correct best size, i.e. the same size as AutoSize...

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

diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index 4ff31ef0f7b78d588c2707c6d815523ef4b52822..51aff2b707c69d038cd855424c0930e9e07b9d19 100644 (file)
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:      msw/region.cpp
+// Name:      src/msw/region.cpp

 // Purpose:   wxRegion implementation using Win32 API
 // Author:    Vadim Zeitlin
 // Modified by:
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // RCS-ID:    $Id$
 // Purpose:   wxRegion implementation using Win32 API
 // Author:    Vadim Zeitlin
 // Modified by:
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // RCS-ID:    $Id$

-// Copyright: (c) 1997-2002 wxWindows team
+// Copyright: (c) 1997-2002 wxWidgets team

 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,19 +17,18 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "region.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #include "wx/region.h"
 #endif
 
 #include "wx/region.h"

-#include "wx/gdicmn.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif

 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 


@@ -48,7 +47,7 @@ public:
         m_region = 0;
     }
 
         m_region = 0;
     }
 

-    wxRegionRefData(const wxRegionRefData& data)
+    wxRegionRefData(const wxRegionRefData& data) : wxGDIRefData()

     {
 #if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
         DWORD noBytes = ::GetRegionData(data.m_region, 0, NULL);
     {
 #if defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
         DWORD noBytes = ::GetRegionData(data.m_region, 0, NULL);


@@ -123,6 +122,9 @@ wxRegion::wxRegion(const wxRect& rect)
 wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
 {
 #if defined(__WXMICROWIN__) || defined(__WXWINCE__)
 wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
 {
 #if defined(__WXMICROWIN__) || defined(__WXWINCE__)

+    wxUnusedVar(n);
+    wxUnusedVar(points);
+    wxUnusedVar(fillStyle);

     m_refData = NULL;
     M_REGION = NULL;
 #else
     m_refData = NULL;
     M_REGION = NULL;
 #else


@@ -161,14 +163,14 @@ void wxRegion::Clear()
     UnRef();
 }
 
     UnRef();
 }
 

-bool wxRegion::Offset(wxCoord x, wxCoord y)
+bool wxRegion::DoOffset(wxCoord x, wxCoord y)

 {
 {

-    wxCHECK_MSG( M_REGION, FALSE, _T("invalid wxRegion") );
+    wxCHECK_MSG( M_REGION, false, _T("invalid wxRegion") );

 
     if ( !x && !y )
     {
         // nothing to do
 
     if ( !x && !y )
     {
         // nothing to do

-        return TRUE;
+        return true;

     }
 
     AllocExclusive();
     }
 
     AllocExclusive();


@@ -177,14 +179,14 @@ bool wxRegion::Offset(wxCoord x, wxCoord y)
     {
         wxLogLastError(_T("OffsetRgn"));
 
     {
         wxLogLastError(_T("OffsetRgn"));
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    return TRUE;
+    return true;

 }
 
 // combine another region with this one
 }
 
 // combine another region with this one

-bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op)
+bool wxRegion::DoCombine(const wxRegion& rgn, wxRegionOp op)

 {
     // we can't use the API functions if we don't have a valid region handle
     if ( !m_refData )
 {
     // we can't use the API functions if we don't have a valid region handle
     if ( !m_refData )


@@ -206,7 +208,7 @@ bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op)
             case wxRGN_AND:
             case wxRGN_DIFF:
                 // leave empty/invalid
             case wxRGN_AND:
             case wxRGN_DIFF:
                 // leave empty/invalid

-                return FALSE;
+                return false;

         }
     }
     else // we have a valid region
         }
     }
     else // we have a valid region


@@ -245,25 +247,11 @@ bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op)
         {
             wxLogLastError(_T("CombineRgn"));
 
         {
             wxLogLastError(_T("CombineRgn"));
 

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return TRUE;
-}
-
-// Combine rectangle (x, y, w, h) with this.
-bool wxRegion::Combine(wxCoord x, wxCoord y,
-                       wxCoord width, wxCoord height,
-                       wxRegionOp op)
-{
-    return Combine(wxRegion(x, y, width, height), op);
-}
-
-bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
-{
-    return Combine(rect.GetLeft(), rect.GetTop(),
-                   rect.GetWidth(), rect.GetHeight(), op);
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -271,7 +259,7 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 // ----------------------------------------------------------------------------
 
 // Outer bounds of region
 // ----------------------------------------------------------------------------
 
 // Outer bounds of region

-void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
+bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const

 {
     if (m_refData)
     {
 {
     if (m_refData)
     {


@@ -281,22 +269,19 @@ void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
         y = rect.top;
         w = rect.right - rect.left;
         h = rect.bottom - rect.top;
         y = rect.top;
         w = rect.right - rect.left;
         h = rect.bottom - rect.top;

+
+        return true;

     }
     else
     {
         x = y = w = h = 0;
     }
     else
     {
         x = y = w = h = 0;

-    }
-}

 
 

-wxRect wxRegion::GetBox() const
-{
-    wxCoord x, y, w, h;
-    GetBox(x, y, w, h);
-    return wxRect(x, y, w, h);
+        return false;
+    }

 }
 
 // Is region empty?
 }
 
 // Is region empty?

-bool wxRegion::Empty() const
+bool wxRegion::IsEmpty() const

 {
     wxCoord x, y, w, h;
     GetBox(x, y, w, h);
 {
     wxCoord x, y, w, h;
     GetBox(x, y, w, h);


@@ -304,12 +289,17 @@ bool wxRegion::Empty() const
     return (w == 0) && (h == 0);
 }
 
     return (w == 0) && (h == 0);
 }
 

+bool wxRegion::DoIsEqual(const wxRegion& region) const
+{
+    return ::EqualRgn(M_REGION, M_REGION_OF(region)) != 0;
+}
+

 // ----------------------------------------------------------------------------
 // wxRegion hit testing
 // ----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?
 // ----------------------------------------------------------------------------
 // wxRegion hit testing
 // ----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?

-wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const
+wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const

 {
     if (!m_refData)
         return wxOutRegion;
 {
     if (!m_refData)
         return wxOutRegion;


@@ -317,32 +307,16 @@ wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const
     return ::PtInRegion(M_REGION, (int) x, (int) y) ? wxInRegion : wxOutRegion;
 }
 
     return ::PtInRegion(M_REGION, (int) x, (int) y) ? wxInRegion : wxOutRegion;
 }
 

-// Does the region contain the point pt?
-wxRegionContain wxRegion::Contains(const wxPoint& pt) const
-{
-    return Contains(pt.x, pt.y);
-}
-

 // Does the region contain the rectangle (x, y, w, h)?
 // Does the region contain the rectangle (x, y, w, h)?

-wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y,
-                                   wxCoord w, wxCoord h) const
+wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const

 {
     if (!m_refData)
         return wxOutRegion;
 
 {
     if (!m_refData)
         return wxOutRegion;
 

-    RECT rect;
-    rect.left = x;
-    rect.top = y;
-    rect.right = x + w;
-    rect.bottom = y + h;
+    RECT rc;
+    wxCopyRectToRECT(rect, rc);

 
 

-    return ::RectInRegion(M_REGION, &rect) ? wxInRegion : wxOutRegion;
-}
-
-// Does the region contain the rectangle rect
-wxRegionContain wxRegion::Contains(const wxRect& rect) const
-{
-    return Contains(rect.x, rect.y, rect.width, rect.height);
+    return ::RectInRegion(M_REGION, &rc) ? wxInRegion : wxOutRegion;

 }
 
 // Get internal region handle
 }
 
 // Get internal region handle


@@ -421,7 +395,6 @@ void wxRegionIterator::Reset(const wxRegion& region)
         m_numRects = 0;
     else
     {
         m_numRects = 0;
     else
     {

-#if defined(__WIN32__)

         DWORD noBytes = ::GetRegionData(((wxRegionRefData*)region.m_refData)->m_region, 0, NULL);
         RGNDATA *rgnData = (RGNDATA*) new char[noBytes];
         ::GetRegionData(((wxRegionRefData*)region.m_refData)->m_region, noBytes, rgnData);
         DWORD noBytes = ::GetRegionData(((wxRegionRefData*)region.m_refData)->m_region, 0, NULL);
         RGNDATA *rgnData = (RGNDATA*) new char[noBytes];
         ::GetRegionData(((wxRegionRefData*)region.m_refData)->m_region, noBytes, rgnData);


@@ -442,17 +415,6 @@ void wxRegionIterator::Reset(const wxRegion& region)
         m_numRects = header->nCount;
 
         delete[] (char*) rgnData;
         m_numRects = header->nCount;
 
         delete[] (char*) rgnData;

-#else // Win16
-        RECT rect;
-        ::GetRgnBox(((wxRegionRefData*)region.m_refData)->m_region, &rect);
-        m_rects = new wxRect[1];
-        m_rects[0].x = rect.left;
-        m_rects[0].y = rect.top;
-        m_rects[0].width = rect.right - rect.left;
-        m_rects[0].height = rect.bottom - rect.top;
-
-        m_numRects = 1;
-#endif // Win32/16

     }
 }
 
     }
 }
 


@@ -504,4 +466,3 @@ wxCoord wxRegionIterator::GetH() const
 
     return m_rects[m_current].height;
 }
 
     return m_rects[m_current].height;
 }

-