*** empty log message ***

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

diff --git a/src/os2/region.cpp b/src/os2/region.cpp
index c71d4c605a45a15004c399c66b2a1577e4c6e716..2ea5f9d6847235629a86c314705ee0eede1a0133 100644 (file)
--- a/src/os2/region.cpp
+++ b/src/os2/region.cpp
@@ -1,24 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 // File:      region.cpp
 // Purpose:   Region class
 /////////////////////////////////////////////////////////////////////////////
 // File:      region.cpp
 // Purpose:   Region class

-// Author:    Markus Holzem/Julian Smart/AUTHOR
-// Created:   Fri Oct 24 10:46:34 MET 1997
+// Author:    David Webster
+// Modified by:
+// Created:   10/15/99

 // RCS-ID:       $Id$
 // RCS-ID:       $Id$

-// Copyright: (c) 1997 Markus Holzem/Julian Smart/AUTHOR
+// Copyright: (c) Davdi Webster

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

-#ifdef __GNUG__
-#pragma implementation "region.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#include "wx/region.h"
+#include "wx/os2/region.h"

 #include "wx/gdicmn.h"
 
 #include "wx/gdicmn.h"
 

-#if !USE_SHARED_LIBRARY
+#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)

-#endif

 
 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation
 
 //-----------------------------------------------------------------------------
 // wxRegionRefData implementation


@@ -26,21 +27,26 @@
 
 class WXDLLEXPORT wxRegionRefData : public wxGDIRefData {
 public:
 
 class WXDLLEXPORT wxRegionRefData : public wxGDIRefData {
 public:

-       wxRegionRefData()
-       {
-       }
+    wxRegionRefData()
+    {
+        m_region = 0;
+    }

 
 

-       wxRegionRefData(const wxRegionRefData& data)
-       {
+    wxRegionRefData(const wxRegionRefData& data)
+    {

         // TODO
         // TODO

-       }
+    }

 
 

-       ~wxRegionRefData()
-       {
+    ~wxRegionRefData()
+    {

         // TODO
         // TODO

-       }
+
+    }
+
+    HRGN m_region;

 };
 
 };
 

+#define M_REGION (((wxRegionRefData*)m_refData)->m_region)

 
 //-----------------------------------------------------------------------------
 // wxRegion
 
 //-----------------------------------------------------------------------------
 // wxRegion


@@ -55,7 +61,13 @@ wxRegion::wxRegion()
     // TODO create empty region
 }
 
     // TODO create empty region
 }
 

-wxRegion::wxRegion(long x, long y, long w, long h)
+wxRegion::wxRegion(WXHRGN hRegion)
+{
+    m_refData = new wxRegionRefData;
+    M_REGION = (HRGN) hRegion;
+}
+
+wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)

 {
     m_refData = new wxRegionRefData;
     // TODO create rect region
 {
     m_refData = new wxRegionRefData;
     // TODO create rect region


@@ -92,16 +104,16 @@ void wxRegion::Clear()
 }
 
 //! Combine rectangle (x, y, w, h) with this.
 }
 
 //! Combine rectangle (x, y, w, h) with this.

-bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
+bool wxRegion::Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op)

 {
 {

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

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


@@ -135,17 +147,17 @@ bool wxRegion::Combine(long x, long y, long width, long height, wxRegionOp op)
 //! Union /e region with this.
 bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
 {
 //! Union /e region with this.
 bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
 {

-       if (region.Empty())
-               return FALSE;
-
-       // Don't change shared data
-       if (!m_refData) {
-               m_refData = new wxRegionRefData();
-       } else  if (m_refData->GetRefCount() > 1) {
-               wxRegionRefData* ref = (wxRegionRefData*)m_refData;
-               UnRef();
-               m_refData = new wxRegionRefData(*ref);
-       }
+    if (region.Empty())
+        return FALSE;
+
+    // Don't change shared data
+    if (!m_refData) {
+        m_refData = new wxRegionRefData();
+    } else  if (m_refData->GetRefCount() > 1) {
+        wxRegionRefData* ref = (wxRegionRefData*)m_refData;
+        UnRef();
+        m_refData = new wxRegionRefData(*ref);
+    }

 
     int mode = 0; // TODO platform-specific code
     switch (op)
 
     int mode = 0; // TODO platform-specific code
     switch (op)


@@ -170,7 +182,7 @@ bool wxRegion::Combine(const wxRegion& region, wxRegionOp op)
 
     // TODO combine region
 
 
     // TODO combine region
 

-       return FALSE;
+    return FALSE;

 }
 
 bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 }
 
 bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)


@@ -183,18 +195,18 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 //-----------------------------------------------------------------------------
 
 // Outer bounds of region
 //-----------------------------------------------------------------------------
 
 // Outer bounds of region

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

 {
 {

-       if (m_refData) {
+    if (m_refData) {

         // TODO get box
         // TODO get box

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

 }
 
 wxRect wxRegion::GetBox() const
 {
 }
 
 wxRect wxRegion::GetBox() const
 {

-    long x, y, w, h;
+    wxCoord x, y, w, h;

     GetBox(x, y, w, h);
     return wxRect(x, y, w, h);
 }
     GetBox(x, y, w, h);
     return wxRect(x, y, w, h);
 }


@@ -211,13 +223,14 @@ bool wxRegion::Empty() const
 //-----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?
 //-----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?

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

 {
 {

-       if (!m_refData)
-               return wxOutRegion;
+    bool    bOK = FALSE; // temporary
+    if (!m_refData)
+        return wxOutRegion;

 
     // TODO. Return wxInRegion if within region.
 
     // TODO. Return wxInRegion if within region.

-    if (0)
+    if (bOK)

         return wxInRegion;
     return wxOutRegion;
 }
         return wxInRegion;
     return wxOutRegion;
 }


@@ -225,24 +238,26 @@ wxRegionContain wxRegion::Contains(long x, long y) const
 // Does the region contain the point pt?
 wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 {
 // Does the region contain the point pt?
 wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 {

-       if (!m_refData)
-               return wxOutRegion;
+    bool    bOK = FALSE; // temporary
+    if (!m_refData)
+        return wxOutRegion;

 
     // TODO. Return wxInRegion if within region.
 
     // TODO. Return wxInRegion if within region.

-    if (0)
+    if (bOK)

         return wxInRegion;
     else
         return wxOutRegion;
 }
 
 // Does the region contain the rectangle (x, y, w, h)?
         return wxInRegion;
     else
         return wxOutRegion;
 }
 
 // Does the region contain the rectangle (x, y, w, h)?

-wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const
+wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y, wxCoord w, wxCoord h) const

 {
 {

-       if (!m_refData)
-               return wxOutRegion;
+    bool    bOK = FALSE; // temporary
+    if (!m_refData)
+        return wxOutRegion;

 
     // TODO. Return wxInRegion if within region.
 
     // TODO. Return wxInRegion if within region.

-    if (0)
+    if (bOK)

         return wxInRegion;
     else
         return wxOutRegion;
         return wxInRegion;
     else
         return wxOutRegion;


@@ -251,10 +266,10 @@ wxRegionContain wxRegion::Contains(long x, long y, long w, long h) const
 // Does the region contain the rectangle rect
 wxRegionContain wxRegion::Contains(const wxRect& rect) const
 {
 // Does the region contain the rectangle rect
 wxRegionContain wxRegion::Contains(const wxRect& rect) const
 {

-       if (!m_refData)
-               return wxOutRegion;
+    if (!m_refData)
+        return wxOutRegion;

 
 

-    long x, y, w, h;
+    wxCoord x, y, w, h;

     x = rect.x;
     y = rect.y;
     w = rect.GetWidth();
     x = rect.x;
     y = rect.y;
     w = rect.GetWidth();


@@ -262,10 +277,18 @@ wxRegionContain wxRegion::Contains(const wxRect& rect) const
     return Contains(x, y, w, h);
 }
 
     return Contains(x, y, w, h);
 }
 

+// Get internal region handle
+WXHRGN wxRegion::GetHRGN() const
+{
+    if (!m_refData)
+        return (WXHRGN) 0;
+    return (WXHRGN) M_REGION;
+}
+

 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-//                                                                                                                                                      //
-//                                                        wxRegionIterator                                                              //
-//                                                                                                                                                      //
+//                                                                           //
+//                             wxRegionIterator                              //
+//                                                                           //

 ///////////////////////////////////////////////////////////////////////////////
 
 /*!
 ///////////////////////////////////////////////////////////////////////////////
 
 /*!


@@ -288,7 +311,7 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
 {
     m_rects = NULL;
 
 {
     m_rects = NULL;
 

-       Reset(region);
+    Reset(region);

 }
 
 /*!
 }
 
 /*!


@@ -296,17 +319,17 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
  */
 void wxRegionIterator::Reset(const wxRegion& region)
 {
  */
 void wxRegionIterator::Reset(const wxRegion& region)
 {

-       m_current = 0;
-       m_region = region;
+    m_current = 0;
+    m_region = region;

 
     if (m_rects)
         delete[] m_rects;
 
     m_rects = NULL;
 
 
     if (m_rects)
         delete[] m_rects;
 
     m_rects = NULL;
 

-       if (m_region.Empty())
-               m_numRects = 0;
-       else
+    if (m_region.Empty())
+        m_numRects = 0;
+    else

     {
         // TODO create m_rects and fill with rectangles for this region
         m_numRects = 0;
     {
         // TODO create m_rects and fill with rectangles for this region
         m_numRects = 0;


@@ -319,8 +342,8 @@ void wxRegionIterator::Reset(const wxRegion& region)
  */
 void wxRegionIterator::operator ++ ()
 {
  */
 void wxRegionIterator::operator ++ ()
 {

-       if (m_current < m_numRects)
-               ++m_current;
+    if (m_current < m_numRects)
+        ++m_current;

 }
 
 /*!
 }
 
 /*!


@@ -329,35 +352,35 @@ void wxRegionIterator::operator ++ ()
  */
 void wxRegionIterator::operator ++ (int)
 {
  */
 void wxRegionIterator::operator ++ (int)
 {

-       if (m_current < m_numRects)
-               ++m_current;
+    if (m_current < m_numRects)
+        ++m_current;

 }
 
 }
 

-long wxRegionIterator::GetX() const
+wxCoord wxRegionIterator::GetX() const

 {
 {

-       if (m_current < m_numRects)
-               return m_rects[m_current].x;
-       return 0;
+    if (m_current < m_numRects)
+        return m_rects[m_current].x;
+    return 0;

 }
 
 }
 

-long wxRegionIterator::GetY() const
+wxCoord wxRegionIterator::GetY() const

 {
 {

-       if (m_current < m_numRects)
-               return m_rects[m_current].y;
-       return 0;
+    if (m_current < m_numRects)
+        return m_rects[m_current].y;
+    return 0;

 }
 
 }
 

-long wxRegionIterator::GetW() const
+wxCoord wxRegionIterator::GetW() const

 {
 {

-       if (m_current < m_numRects)
-               return m_rects[m_current].width ;
-       return 0;
+    if (m_current < m_numRects)
+        return m_rects[m_current].width ;
+    return 0;

 }
 
 }
 

-long wxRegionIterator::GetH() const
+wxCoord wxRegionIterator::GetH() const

 {
 {

-       if (m_current < m_numRects)
-               return m_rects[m_current].height;
-       return 0;
+    if (m_current < m_numRects)
+        return m_rects[m_current].height;
+    return 0;

 }
 
 }