made unzip.c accept / and \ in filenames as equal

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

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index a19730b0d06456fc8ef9b13d5ab2058d7be2b1de..edb6b766d9f64ee74c5601155d7191ae9ee8eef9 100644 (file)
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        region.cpp
+// Name:        gtk/region.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -16,18 +16,16 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
+
 //-----------------------------------------------------------------------------
 // wxRegion
 //-----------------------------------------------------------------------------
 
 class wxRegionRefData: public wxObjectRefData
 {
-  public:
-  
+public:
     wxRegionRefData();
     ~wxRegionRefData();
-  
-  public:    
 
     GdkRegion  *m_region;
     wxList      m_rects;
@@ -41,7 +39,7 @@ wxRegionRefData::wxRegionRefData()
 wxRegionRefData::~wxRegionRefData()
 {
     if (m_region) gdk_region_destroy( m_region );
-  
+
     wxNode *node = m_rects.First();
     while (node)
     {
@@ -56,8 +54,8 @@ wxRegionRefData::~wxRegionRefData()
 #define M_REGIONDATA ((wxRegionRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion,wxGDIObject);
-  
-wxRegion::wxRegion( long x, long y, long w, long h )
+
+wxRegion::wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
 {
     m_refData = new wxRegionRefData();
     GdkRegion *reg = gdk_region_new();
@@ -96,7 +94,7 @@ wxRegion::wxRegion( const wxRect& rect )
     g_rect.height = rect.height;
     M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect );
     gdk_region_destroy( reg );
-  
+
     wxNode *node = M_REGIONDATA->m_rects.First();
     while (node)
     {
@@ -118,12 +116,12 @@ wxRegion::~wxRegion()
 
 bool wxRegion::operator == ( const wxRegion& region )
 {
-    return m_refData == region.m_refData; 
+    return m_refData == region.m_refData;
 }
 
 bool wxRegion::operator != ( const wxRegion& region )
 {
-    return m_refData != region.m_refData; 
+    return m_refData != region.m_refData;
 }
 
 void wxRegion::Clear()
@@ -133,7 +131,7 @@ void wxRegion::Clear()
     M_REGIONDATA->m_region = gdk_region_new();
 }
 
-bool wxRegion::Union( long x, long y, long width, long height )
+bool wxRegion::Union( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
     GdkRectangle rect;
     rect.x = x;
@@ -166,7 +164,7 @@ bool wxRegion::Union( const wxRegion& region )
     GdkRegion *reg = gdk_regions_union( M_REGIONDATA->m_region, region.GetRegion() );
     gdk_region_destroy( M_REGIONDATA->m_region );
     M_REGIONDATA->m_region = reg;
-  
+
     wxNode *node = region.GetRectList()->First();
     while (node)
     {
@@ -174,11 +172,11 @@ bool wxRegion::Union( const wxRegion& region )
         M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
         node = node->Next();
     }
-  
+
     return TRUE;
 }
 
-bool wxRegion::Intersect( long x, long y, long width, long height )
+bool wxRegion::Intersect( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
     wxRegion reg( x, y, width, height );
     Intersect( reg );
@@ -200,7 +198,7 @@ bool wxRegion::Intersect( const wxRegion& region )
     return TRUE;
 }
 
-bool wxRegion::Subtract( long x, long y, long width, long height )
+bool wxRegion::Subtract( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
     wxRegion reg( x, y, width, height );
     Subtract( reg );
@@ -222,7 +220,7 @@ bool wxRegion::Subtract( const wxRegion& region )
     return TRUE;
 }
 
-bool wxRegion::Xor( long x, long y, long width, long height )
+bool wxRegion::Xor( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
     wxRegion reg( x, y, width, height );
     Xor( reg );
@@ -241,7 +239,7 @@ bool wxRegion::Xor( const wxRegion& region )
     GdkRegion *reg = gdk_regions_xor( M_REGIONDATA->m_region, region.GetRegion() );
     gdk_region_destroy( M_REGIONDATA->m_region );
     M_REGIONDATA->m_region = reg;
-  
+
     wxNode *node = region.GetRectList()->First();
     while (node)
     {
@@ -249,58 +247,30 @@ bool wxRegion::Xor( const wxRegion& region )
         M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
         node = node->Next();
     }
-  
+
     return TRUE;
 }
 
-void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const
+void wxRegion::GetBox( wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h ) const
 {
     x = 0;
     y = 0;
     w = -1;
     h = -1;
-    wxNode *node = GetRectList()->First();
-    while (node)
-    {
-        wxRect *r = (wxRect*)node->Data();
-        if (node == GetRectList()->First())
-        {
-            x = r->x;
-            y = r->y;
-            w = r->width;
-            h = r->height;
-        }
-        else
-        {
-            if (r->x < x)
-            {
-                x = r->x;
-                w += x - r->x;
-            }
-            if (r->y < y) 
-            {
-                y = r->y;
-                h += y - r->y;
-            }
-            if (r->width+r->x > x+w) 
-            {
-                w = r->x + r->width - x;
-            }
-            if (r->height+r->y > y+h) 
-            {
-                h = r->y + r->height - y;
-            }
-        }
-        node = node->Next();
-    }
+    GdkRectangle rect;
+    gdk_region_get_clipbox( M_REGIONDATA->m_region, &rect );
+    x = rect.x;
+    y = rect.y;
+    w = rect.width;
+    h = rect.height;
 }
 
 wxRect wxRegion::GetBox() const
 {
-    long x = 0;
-    long y = 0;
-    long w = -1;
-    long h = -1;
+    wxCoord x = 0;
+    wxCoord y = 0;
+    wxCoord w = -1;
+    wxCoord h = -1;
     GetBox( x, y, w, h );
     return wxRect( x, y, w, h );
 }
@@ -310,7 +280,7 @@ bool wxRegion::Empty() const
     return gdk_region_empty( M_REGIONDATA->m_region );
 }
 
-wxRegionContain wxRegion::Contains( long x, long y ) const
+wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y ) const
 {
     if (gdk_region_point_in( M_REGIONDATA->m_region, x, y ))
         return wxInRegion;
@@ -318,7 +288,7 @@ wxRegionContain wxRegion::Contains( long x, long y ) const
         return wxOutRegion;
 }
 
-wxRegionContain wxRegion::Contains( long x, long y, long w, long h ) const
+wxRegionContain wxRegion::Contains( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) const
 {
     GdkRectangle rect;
     rect.x = x;
@@ -360,42 +330,41 @@ wxList *wxRegion::GetRectList() const
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
-  
+
 wxRegionIterator::wxRegionIterator()
 {
-    m_current = 0;
+    Reset();
 }
 
 wxRegionIterator::wxRegionIterator( const wxRegion& region )
 {
-    m_region = region;
-    m_current = 0;
+    Reset(region);
 }
 
 void wxRegionIterator::Reset( const wxRegion& region )
 {
     m_region = region;
-    m_current = 0;
+    Reset();
 }
 
-wxRegionIterator::operator bool () const 
-{ 
-    return m_current < m_region.GetRectList()->Number(); 
+wxRegionIterator::operator bool () const
+{
+    return m_current < (size_t)m_region.GetRectList()->Number();
 }
 
-bool wxRegionIterator::HaveRects() const 
-{ 
-    return m_current < m_region.GetRectList()->Number(); 
+bool wxRegionIterator::HaveRects() const
+{
+    return m_current < (size_t)m_region.GetRectList()->Number();
 }
 
 void wxRegionIterator::operator ++ ()
 {
-    if (m_current < m_region.GetRectList()->Number()) ++m_current;
+    if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
 }
 
 void wxRegionIterator::operator ++ (int)
 {
-    if (m_current < m_region.GetRectList()->Number()) ++m_current;
+    if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
 }
 
 wxCoord wxRegionIterator::GetX() const