[ 1563875 ] wxTreeCtrl::FindItem asserts when item not found

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

diff --git a/src/x11/region.cpp b/src/x11/region.cpp
index 78be8597084ab2b73f918d2c64f0cf95438d0fba..02b26b16004b81ad1c184e00d9db961368b26a54 100644 (file)
--- a/src/x11/region.cpp
+++ b/src/x11/region.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// File:      region.cpp
+// File:      src/x11/region.cpp

 // Purpose:   Region class
 // Author:    Julian Smart, Robert Roebling
 // Created:   Fri Oct 24 10:46:34 MET 1997
 // Purpose:   Region class
 // Author:    Julian Smart, Robert Roebling
 // Created:   Fri Oct 24 10:46:34 MET 1997


@@ -8,13 +8,15 @@
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "region.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/region.h"
 
 #include "wx/region.h"

-#include "wx/gdicmn.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/gdicmn.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -36,14 +38,14 @@ public:
     {
         m_region = NULL;
     }
     {
         m_region = NULL;
     }

-    
+

     wxRegionRefData(const wxRegionRefData& refData)
     {
         m_region = XCreateRegion();
         XUnionRegion( refData.m_region, m_region, m_region );
     }
     wxRegionRefData(const wxRegionRefData& refData)
     {
         m_region = XCreateRegion();
         XUnionRegion( refData.m_region, m_region, m_region );
     }

-    
-    ~wxRegionRefData()
+
+    virtual ~wxRegionRefData()

     {
         if (m_region)
             XDestroyRegion( m_region );
     {
         if (m_region)
             XDestroyRegion( m_region );


@@ -59,8 +61,8 @@ public:
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
 
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 #define M_REGIONDATA_OF(rgn) ((wxRegionRefData *)(rgn.m_refData))
 

-IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject);
-IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
+IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject)

 
 // ----------------------------------------------------------------------------
 // wxRegion construction
 
 // ----------------------------------------------------------------------------
 // wxRegion construction


@@ -71,18 +73,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
 void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 {
     XRectangle rect;
 void wxRegion::InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 {
     XRectangle rect;

-    rect.x = x;
-    rect.y = y;
-    rect.width = w;
-    rect.height = h;
-    
+    rect.x = (short)x;
+    rect.y = (short)y;
+    rect.width = (unsigned short)w;
+    rect.height = (unsigned short)h;
+

     m_refData = new wxRegionRefData();
     m_refData = new wxRegionRefData();

-    
+

     M_REGIONDATA->m_region = XCreateRegion();
     XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region );
 }
 
     M_REGIONDATA->m_region = XCreateRegion();
     XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region );
 }
 

-wxRegion::wxRegion( size_t n, const wxPoint *points, int fillStyle )
+wxRegion::wxRegion( size_t WXUNUSED(n), const wxPoint *WXUNUSED(points), int WXUNUSED(fillStyle) )

 {
 #if 0
     XPoint *xpoints = new XPoint[n];
 {
 #if 0
     XPoint *xpoints = new XPoint[n];


@@ -127,15 +129,15 @@ wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 
 // wxRegion comparison
 // ----------------------------------------------------------------------------
 

-bool wxRegion::operator==( const wxRegion& region )
+bool wxRegion::operator==( const wxRegion& region ) const

 {
 {

-    if (m_refData == region.m_refData) return TRUE;
+    if (m_refData == region.m_refData) return true;
+
+    if (!m_refData || !region.m_refData) return false;

 
 

-    if (!m_refData || !region.m_refData) return FALSE;
-    

     // compare the regions themselves, not the pointers to ref data!
     return XEqualRegion( M_REGIONDATA->m_region,
     // compare the regions themselves, not the pointers to ref data!
     return XEqualRegion( M_REGIONDATA->m_region,

-                         M_REGIONDATA_OF(region)->m_region );
+                         M_REGIONDATA_OF(region)->m_region ) == True;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -153,14 +155,14 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
     // rect results in an empty region (at least XFree 3.3.6 and 4.0 have this
     // problem)
     if ( !width || !height )
     // rect results in an empty region (at least XFree 3.3.6 and 4.0 have this
     // problem)
     if ( !width || !height )

-        return TRUE;
+        return true;

 
     XRectangle rect;
 
     XRectangle rect;

-    rect.x = x;
-    rect.y = y;
-    rect.width = width;
-    rect.height = height;
-    
+    rect.x = (short)x;
+    rect.y = (short)y;
+    rect.width = (unsigned short)width;
+    rect.height = (unsigned short)height;
+

     if (!m_refData)
     {
         m_refData = new wxRegionRefData();
     if (!m_refData)
     {
         m_refData = new wxRegionRefData();


@@ -174,7 +176,7 @@ bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
         XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region );
     }
 
         XUnionRectWithRegion( &rect, M_REGIONDATA->m_region, M_REGIONDATA->m_region );
     }
 

-    return TRUE;
+    return true;

 }
 
 bool wxRegion::Union( const wxRect& rect )
 }
 
 bool wxRegion::Union( const wxRect& rect )


@@ -185,7 +187,7 @@ bool wxRegion::Union( const wxRect& rect )
 bool wxRegion::Union( const wxRegion& region )
 {
     if (region.IsNull())
 bool wxRegion::Union( const wxRegion& region )
 {
     if (region.IsNull())

-        return FALSE;
+        return false;

 
     if (!m_refData)
     {
 
     if (!m_refData)
     {


@@ -196,12 +198,12 @@ bool wxRegion::Union( const wxRegion& region )
     {
         AllocExclusive();
     }
     {
         AllocExclusive();
     }

-    
+

     XUnionRegion( M_REGIONDATA->m_region,
                   M_REGIONDATA_OF(region)->m_region,
                   M_REGIONDATA->m_region );
 
     XUnionRegion( M_REGIONDATA->m_region,
                   M_REGIONDATA_OF(region)->m_region,
                   M_REGIONDATA->m_region );
 

-    return TRUE;
+    return true;

 }
 
 bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 }
 
 bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )


@@ -214,22 +216,22 @@ bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 bool wxRegion::Intersect( const wxRect& rect )
 {
     wxRegion reg( rect );
 bool wxRegion::Intersect( const wxRect& rect )
 {
     wxRegion reg( rect );

-    
+

     return Intersect( reg );
 }
 
 bool wxRegion::Intersect( const wxRegion& region )
 {
     if (region.IsNull())
     return Intersect( reg );
 }
 
 bool wxRegion::Intersect( const wxRegion& region )
 {
     if (region.IsNull())

-        return FALSE;
+        return false;

 
     if (!m_refData)
     {
         m_refData = new wxRegionRefData();
         M_REGIONDATA->m_region = XCreateRegion();
 
     if (!m_refData)
     {
         m_refData = new wxRegionRefData();
         M_REGIONDATA->m_region = XCreateRegion();

-        
-        // leave here 
-        return TRUE;
+
+        // leave here
+        return true;

     }
     else
     {
     }
     else
     {


@@ -240,7 +242,7 @@ bool wxRegion::Intersect( const wxRegion& region )
                       M_REGIONDATA_OF(region)->m_region,
                       M_REGIONDATA->m_region );
 
                       M_REGIONDATA_OF(region)->m_region,
                       M_REGIONDATA->m_region );
 

-    return TRUE;
+    return true;

 }
 
 bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 }
 
 bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )


@@ -258,7 +260,7 @@ bool wxRegion::Subtract( const wxRect& rect )
 bool wxRegion::Subtract( const wxRegion& region )
 {
     if (region.IsNull())
 bool wxRegion::Subtract( const wxRegion& region )
 {
     if (region.IsNull())

-        return FALSE;
+        return false;

 
     if (!m_refData)
     {
 
     if (!m_refData)
     {


@@ -274,7 +276,7 @@ bool wxRegion::Subtract( const wxRegion& region )
                      M_REGIONDATA_OF(region)->m_region,
                      M_REGIONDATA->m_region );
 
                      M_REGIONDATA_OF(region)->m_region,
                      M_REGIONDATA->m_region );
 

-    return TRUE;
+    return true;

 }
 
 bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 }
 
 bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )


@@ -292,7 +294,7 @@ bool wxRegion::Xor( const wxRect& rect )
 bool wxRegion::Xor( const wxRegion& region )
 {
     if (region.IsNull())
 bool wxRegion::Xor( const wxRegion& region )
 {
     if (region.IsNull())

-        return FALSE;
+        return false;

 
     if (!m_refData)
     {
 
     if (!m_refData)
     {


@@ -307,8 +309,8 @@ bool wxRegion::Xor( const wxRegion& region )
     XXorRegion( M_REGIONDATA->m_region,
                 M_REGIONDATA_OF(region)->m_region,
                 M_REGIONDATA->m_region );
     XXorRegion( M_REGIONDATA->m_region,
                 M_REGIONDATA_OF(region)->m_region,
                 M_REGIONDATA->m_region );

-                
-    return TRUE;
+
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -345,21 +347,21 @@ wxRect wxRegion::GetBox() const
 bool wxRegion::Offset( wxCoord x, wxCoord y )
 {
     if (!m_refData)
 bool wxRegion::Offset( wxCoord x, wxCoord y )
 {
     if (!m_refData)

-        return FALSE;
+        return false;

 
     AllocExclusive();
 
     XOffsetRegion( M_REGIONDATA->m_region, x, y );
 
 
     AllocExclusive();
 
     XOffsetRegion( M_REGIONDATA->m_region, x, y );
 

-    return TRUE;
+    return true;

 }
 
 bool wxRegion::Empty() const
 {
     if (!m_refData)
 }
 
 bool wxRegion::Empty() const
 {
     if (!m_refData)

-        return TRUE;
+        return true;

 
 

-    return XEmptyRegion( M_REGIONDATA->m_region );
+    return XEmptyRegion( M_REGIONDATA->m_region ) == True;

 }
 
 wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
 }
 
 wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const


@@ -430,7 +432,7 @@ class wxRIRefData: public wxObjectRefData
 public:
 
     wxRIRefData() : m_rects(0), m_numRects(0){}
 public:
 
     wxRIRefData() : m_rects(0), m_numRects(0){}

-   ~wxRIRefData();
+   virtual ~wxRIRefData();

 
     wxRect *m_rects;
     size_t  m_numRects;
 
     wxRect *m_rects;
     size_t  m_numRects;


@@ -450,9 +452,9 @@ void wxRIRefData::CreateRects( const wxRegion& region )
 
     m_rects = 0;
     m_numRects = 0;
 
     m_rects = 0;
     m_numRects = 0;

-    
+

     if (region.IsEmpty()) return;
     if (region.IsEmpty()) return;

-    
+

     Region r = (Region) region.GetX11Region();
     if (r)
     {
     Region r = (Region) region.GetX11Region();
     if (r)
     {


@@ -555,4 +557,3 @@ wxRect wxRegionIterator::GetRect() const
 
     return r;
 }
 
     return r;
 }

-