X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ed98c6a3b7f2be77ea16b5d26467796c1be9f4d..0fe9c32957672a7b5cc21f9b62b12861e19e51a5:/src/os2/region.cpp

diff --git a/src/os2/region.cpp b/src/os2/region.cpp
index c56301d723..a0723c0073 100644
--- a/src/os2/region.cpp
+++ b/src/os2/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// File:      region.cpp
+// File:      src/os2/region.cpp
 // Purpose:   Region class
 // Author:    David Webster
 // Modified by:
@@ -12,15 +12,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/app.h"
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/window.h"
+#endif
+
 #include "wx/os2/region.h"
 #include "wx/gdicmn.h"
 
-#include "wx/window.h"
 #include "wx/os2/private.h"
 
-    IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
 
 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation
@@ -39,6 +42,7 @@ public:
         RGNRECT                     vRgnData;
         PRECTL                      pRect = NULL;
 
+        vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT;
         if (::GpiQueryRegionRects( rData.m_hPS      // Pres space
                                   ,rData.m_hRegion  // Handle of region to query
                                   ,NULL             // Return all RECTs
@@ -235,15 +239,12 @@ wxObjectRefData *wxRegion::CloneData(const wxObjectRefData *data) const
 //# Modify region
 //-----------------------------------------------------------------------------
 
-bool wxRegion::Offset(
-  wxCoord                           x
-, wxCoord                           y
-)
+bool wxRegion::Offset( wxCoord x, wxCoord y )
 {
     if ( !x && !y )
     {
         // nothing to do
-        return TRUE;
+        return true;
     }
 
     AllocExclusive();
@@ -253,10 +254,10 @@ bool wxRegion::Offset(
     {
         wxLogLastError(_T("OffsetRgn"));
 
-        return FALSE;
+        return false;
     }
 #endif
-    return TRUE;
+    return true;
 }
 
 //
@@ -284,10 +285,7 @@ bool wxRegion::Combine(
 //
 // Union region with this.
 //
-bool wxRegion::Combine(
-  const wxRegion&                   rRegion
-, wxRegionOp                        eOp
-)
+bool wxRegion::Combine( const wxRegion& rRegion, wxRegionOp eOp )
 {
     //
     // We can't use the API functions if we don't have a valid region handle
@@ -311,7 +309,7 @@ bool wxRegion::Combine(
             case wxRGN_AND:
             case wxRGN_DIFF:
                 // leave empty/invalid
-                return FALSE;
+                return false;
         }
     }
     else // we have a valid region
@@ -349,7 +347,7 @@ bool wxRegion::Combine(
                                    ,lMode
                                   ) != RGN_ERROR);
     }
-    return TRUE;
+    return true;
 } // end of wxRegion::Combine
 
 bool wxRegion::Combine(
@@ -411,13 +409,13 @@ wxRect wxRegion::GetBox() const
 //
 bool wxRegion::Empty() const
 {
-    wxCoord                         x;
-    wxCoord                         y;
-    wxCoord                         vWidth;
-    wxCoord                         vHeight;
+    wxCoord x;
+    wxCoord y;
+    wxCoord vWidth;
+    wxCoord vHeight;
 
     if (M_REGION == 0)
-        return TRUE;
+        return true;
 
     GetBox( x
            ,y
@@ -438,7 +436,6 @@ wxRegionContain wxRegion::Contains(
 , wxCoord                           y
 ) const
 {
-    bool                            bOK = FALSE;
     POINTL                          vPoint;
 
     vPoint.x = x;
@@ -554,6 +551,7 @@ void wxRegion::SetPS(
     RGNRECT                     vRgnData;
     PRECTL                      pRect = NULL;
 
+    vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT;
     if (::GpiQueryRegionRects( ((wxRegionRefData*)m_refData)->m_hPS
                               ,((wxRegionRefData*)m_refData)->m_hRegion
                               ,NULL
@@ -629,6 +627,7 @@ void wxRegionIterator::Reset(
 )
 {
     m_lCurrent = 0;
+    m_lNumRects = 0;
     m_vRegion  = rRegion;
 
     if (m_pRects)
@@ -643,6 +642,7 @@ void wxRegionIterator::Reset(
         RGNRECT                     vRgnData;
         PRECTL                      pRect;
 
+        vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT;
         if (::GpiQueryRegionRects( ((wxRegionRefData*)rRegion.m_refData)->m_hPS     // Pres space
                                   ,((wxRegionRefData*)rRegion.m_refData)->m_hRegion // Handle of region to query
                                   ,NULL                                             // Return all RECTs
@@ -662,10 +662,12 @@ void wxRegionIterator::Reset(
                                       ,pRect                                            // Will contain the actual RECTS
                                      ))
             {
+#if 0
                 M_REGION = ::GpiCreateRegion( ((wxRegionRefData*)rRegion.m_refData)->m_hPS
                                              ,vRgnData.crcReturned
                                              ,pRect
                                             );
+#endif
                 for( LONG i = 0; i < m_lNumRects; i++)
                 {
                     m_pRects[i].x      = pRect[i].xLeft;
@@ -673,7 +675,9 @@ void wxRegionIterator::Reset(
                     m_pRects[i].y      = pRect[i].yBottom;
                     m_pRects[i].height = pRect[i].yTop - pRect[i].yBottom;
                 }
+#if 0
                 ((wxRegionRefData*)m_refData)->m_hPS = ((wxRegionRefData*)rRegion.m_refData)->m_hPS;
+#endif
             }
         }
     }
@@ -726,4 +730,3 @@ wxCoord wxRegionIterator::GetH() const
         return m_pRects[m_lCurrent].height;
     return 0L;
 } // end of wxRegionIterator::GetH
-