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

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

diff --git a/src/os2/region.cpp b/src/os2/region.cpp
index f2fe44a6077f0c99af27031d6ed8cfdf93f2ab74..90c7306c8da10993e289e0413f653a34683efd5e 100644 (file)
--- a/src/os2/region.cpp
+++ b/src/os2/region.cpp
@@ -151,10 +151,8 @@ wxRegion::wxRegion(
                                      );
 } // end of wxRegion::wxRegion
 
                                      );
 } // end of wxRegion::wxRegion
 

-wxRegion::wxRegion(
-  const wxPoint&                    rTopLeft
-, const wxPoint&                    rBottomRight
-)
+wxRegion::wxRegion(const wxPoint& rTopLeft,
+                   const wxPoint& rBottomRight)

 {
     RECTL                           vRect;
     SIZEL                           vSize = {0, 0};
 {
     RECTL                           vRect;
     SIZEL                           vSize = {0, 0};


@@ -188,9 +186,7 @@ wxRegion::wxRegion(
                                      );
 } // end of wxRegion::wxRegion
 
                                      );
 } // end of wxRegion::wxRegion
 

-wxRegion::wxRegion(
-  const wxRect&                     rRect
-)
+wxRegion::wxRegion(const wxRect& rRect)

 {
     RECTL                           vRect;
     SIZEL                           vSize = {0, 0};
 {
     RECTL                           vRect;
     SIZEL                           vSize = {0, 0};


@@ -225,6 +221,11 @@ wxRegion::wxRegion(
                                      );
 } // end of wxRegion::wxRegion
 
                                      );
 } // end of wxRegion::wxRegion
 

+wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode WXUNUSED(fillStyle))
+{
+    // TO DO
+}
+

 //
 // Destroy the region.
 //
 //
 // Destroy the region.
 //


@@ -232,12 +233,12 @@ wxRegion::~wxRegion()
 {
 } // end of wxRegion::~wxRegion
 
 {
 } // end of wxRegion::~wxRegion
 

-wxObjectRefData *wxRegion::CreateData() const
+wxGDIRefData *wxRegion::CreateGDIRefData() const

 {
     return new wxRegionRefData;
 }
 
 {
     return new wxRegionRefData;
 }
 

-wxObjectRefData *wxRegion::CloneData(const wxObjectRefData *data) const
+wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxRegionRefData(*(wxRegionRefData *)data);
 }
 {
     return new wxRegionRefData(*(wxRegionRefData *)data);
 }


@@ -259,7 +260,7 @@ bool wxRegion::DoOffset( wxCoord x, wxCoord y )
 #if 0
     if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR )
     {
 #if 0
     if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR )
     {

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

 
         return false;
     }
 
         return false;
     }


@@ -296,7 +297,7 @@ bool wxRegion::DoCombine( const wxRegion& rRegion, wxRegionOp eOp )
                 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: