don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

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

diff --git a/src/os2/region.cpp b/src/os2/region.cpp
index 733998bbf754a61b0bc162efdd27558a64c95020..5404bf64db3871f91175111420abec12a01513b6 100644 (file)
--- a/src/os2/region.cpp
+++ b/src/os2/region.cpp
@@ -220,10 +220,44 @@ wxRegion::~wxRegion()
 {
 } // end of wxRegion::~wxRegion
 
 {
 } // end of wxRegion::~wxRegion
 

+wxObjectRefData *wxRegion::CreateData() const
+{
+    return new wxRegionRefData;
+}
+
+wxObjectRefData *wxRegion::CloneData(const wxObjectRefData *data) const
+{
+    return new wxRegionRefData(*(wxRegionRefData *)data);
+}
+

 //-----------------------------------------------------------------------------
 //# Modify region
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //# Modify region
 //-----------------------------------------------------------------------------
 

+bool wxRegion::Offset(
+  wxCoord                           x
+, wxCoord                           y
+)
+{
+    if ( !x && !y )
+    {
+        // nothing to do
+        return TRUE;
+    }
+
+    AllocExclusive();
+
+#if 0
+    if ( ::OffsetRgn(GetHrgn(), x, y) == ERROR )
+    {
+        wxLogLastError(_T("OffsetRgn"));
+
+        return FALSE;
+    }
+#endif
+    return TRUE;
+}
+

 //
 // Clear current region
 //
 //
 // Clear current region
 //


@@ -243,20 +277,7 @@ bool wxRegion::Combine(
 , wxRegionOp                        eOp
 )
 {
 , wxRegionOp                        eOp
 )
 {

-    //
-    // Don't change shared data
-    //
-    if (!m_refData)
-    {
-        m_refData = new wxRegionRefData();
-    }
-    else if (m_refData->GetRefCount() > 1)
-    {
-        wxRegionRefData*            pRef = (wxRegionRefData*)m_refData;
-
-        UnRef();
-        m_refData = new wxRegionRefData(*pRef);
-    }
+    AllocExclusive();

 
     //
     // If ref count is 1, that means it's 'ours' anyway so no action.
 
     //
     // If ref count is 1, that means it's 'ours' anyway so no action.


@@ -321,20 +342,7 @@ bool wxRegion::Combine(
     if (rRegion.Empty())
         return FALSE;
 
     if (rRegion.Empty())
         return FALSE;
 

-    //
-    // Don't change shared data
-    //
-    if (!m_refData)
-    {
-        m_refData = new wxRegionRefData();
-    }
-    else  if (m_refData->GetRefCount() > 1)
-    {
-        wxRegionRefData*            pRef = (wxRegionRefData*)m_refData;
-
-        UnRef();
-        m_refData = new wxRegionRefData(*pRef);
-    }
+    AllocExclusive();

 
     LONG                            lMode = 0;
 
 
     LONG                            lMode = 0;
 


@@ -406,7 +414,7 @@ void wxRegion::GetBox(
                             ,&vRect
                            );
         x       = vRect.xLeft;
                             ,&vRect
                            );
         x       = vRect.xLeft;

-        y       = vRect.yTop;
+        y       = vRect.yBottom;

         vWidth  = vRect.xRight - vRect.xLeft;
         vHeight = vRect.yTop - vRect.yBottom;
     }
         vWidth  = vRect.xRight - vRect.xLeft;
         vHeight = vRect.yTop - vRect.yBottom;
     }