Rebake after adding libs html and xml to samples using lib adv

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

diff --git a/src/msw/region.cpp b/src/msw/region.cpp
index 424ed9fb891b61eed95511efbfadc9434a99d66e..eb6e6721597a46808fe732d68502012340dfa7e1 100644 (file)
--- a/src/msw/region.cpp
+++ b/src/msw/region.cpp
@@ -6,7 +6,7 @@
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // RCS-ID:    $Id$
 // Copyright: (c) 1997-2002 wxWidgets team
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // RCS-ID:    $Id$
 // Copyright: (c) 1997-2002 wxWidgets team

-// Licence:   wxWidgets licence
+// Licence:   wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -48,7 +44,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 +119,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


@@ -163,12 +162,12 @@ void wxRegion::Clear()
 
 bool wxRegion::Offset(wxCoord x, wxCoord y)
 {
 
 bool wxRegion::Offset(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,10 +176,10 @@ 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


@@ -206,7 +205,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,11 +244,11 @@ bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op)
         {
             wxLogLastError(_T("CombineRgn"));
 
         {
             wxLogLastError(_T("CombineRgn"));
 

-            return FALSE;
+            return false;

         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 // Combine rectangle (x, y, w, h) with this.
 }
 
 // Combine rectangle (x, y, w, h) with this.