merged MapBitmap() from 2.2 branch

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

diff --git a/src/motif/region.cpp b/src/motif/region.cpp
index 8b03f1052b89c4d04626d68ed6a1b3a49c6bfb01..fb3b1e3db2551e6b427f0bdc01a79689adca70bf 100644 (file)
--- a/src/motif/region.cpp
+++ b/src/motif/region.cpp
@@ -15,13 +15,17 @@
 #include "wx/region.h"
 #include "wx/gdicmn.h"
 
 #include "wx/region.h"
 #include "wx/gdicmn.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 // #include "wx/motif/private.h"
 
 // #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
     IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
     IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)

-#endif

 
 // ----------------------------------------------------------------------------
 // list types
 
 // ----------------------------------------------------------------------------
 // list types


@@ -133,7 +137,7 @@ wxRegion::wxRegion()
 {
 }
 
 {
 }
 

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

 {
     m_refData = new wxRegionRefData;
 
 {
     m_refData = new wxRegionRefData;
 


@@ -196,7 +200,7 @@ 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) {
 {
     // Don't change shared data
     if (!m_refData) {


@@ -290,7 +294,7 @@ 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) {
         XRectangle rect;
 {
     if (m_refData) {
         XRectangle rect;


@@ -306,7 +310,7 @@ void wxRegion::GetBox(long& x, long& y, long&w, long &h) const
 
 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);
 }


@@ -322,7 +326,7 @@ bool wxRegion::Empty() const
 //-----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?
 //-----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?

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

 {
     if (!m_refData)
         return wxOutRegion;
 {
     if (!m_refData)
         return wxOutRegion;


@@ -343,7 +347,7 @@ wxRegionContain wxRegion::Contains(const wxPoint& pt) const
 }
 
 // Does the region contain the rectangle (x, y, w, h)?
 }
 
 // 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;
 {
     if (!m_refData)
         return wxOutRegion;


@@ -361,7 +365,7 @@ 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();


@@ -458,8 +462,7 @@ void wxRegionIterator::Reset(const wxRegion& region)
             m_numRects = count;
             m_rects = new wxRect[m_numRects];
 
             m_numRects = count;
             m_rects = new wxRect[m_numRects];
 

-            int i = 0;
-            for (i = 0; i < m_numRects; i++)
+            for (size_t i = 0; i < m_numRects; i++)

                m_rects[i] = rects[i];
 
            /*
                m_rects[i] = rects[i];
 
            /*


@@ -503,28 +506,28 @@ void wxRegionIterator::operator ++ (int)
         ++m_current;
 }
 
         ++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;
 {
     if (m_current < m_numRects)
         return m_rects[m_current].height;