Corrected wxRegion::GetBox()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index a19730b0d06456fc8ef9b13d5ab2058d7be2b1de..5718597469775fbe2193a4df89c9ea3bca5c7665 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -16,19 +16,17 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 

+

 //-----------------------------------------------------------------------------
 // wxRegion
 //-----------------------------------------------------------------------------
 
 class wxRegionRefData: public wxObjectRefData
 {
 //-----------------------------------------------------------------------------
 // wxRegion
 //-----------------------------------------------------------------------------
 
 class wxRegionRefData: public wxObjectRefData
 {

-  public:
-  
+public:

     wxRegionRefData();
     ~wxRegionRefData();
   
     wxRegionRefData();
     ~wxRegionRefData();
   

-  public:    
-

     GdkRegion  *m_region;
     wxList      m_rects;
 };
     GdkRegion  *m_region;
     wxList      m_rects;
 };


@@ -259,40 +257,12 @@ void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const
     y = 0;
     w = -1;
     h = -1;
     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
 }
 
 wxRect wxRegion::GetBox() const

diff --git a/src/gtk1/region.cpp b/src/gtk1/region.cpp
index a19730b0d06456fc8ef9b13d5ab2058d7be2b1de..5718597469775fbe2193a4df89c9ea3bca5c7665 100644 (file)
--- a/src/gtk1/region.cpp
+++ b/src/gtk1/region.cpp
@@ -16,19 +16,17 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 

+

 //-----------------------------------------------------------------------------
 // wxRegion
 //-----------------------------------------------------------------------------
 
 class wxRegionRefData: public wxObjectRefData
 {
 //-----------------------------------------------------------------------------
 // wxRegion
 //-----------------------------------------------------------------------------
 
 class wxRegionRefData: public wxObjectRefData
 {

-  public:
-  
+public:

     wxRegionRefData();
     ~wxRegionRefData();
   
     wxRegionRefData();
     ~wxRegionRefData();
   

-  public:    
-

     GdkRegion  *m_region;
     wxList      m_rects;
 };
     GdkRegion  *m_region;
     wxList      m_rects;
 };


@@ -259,40 +257,12 @@ void wxRegion::GetBox( long& x, long& y, long&w, long &h ) const
     y = 0;
     w = -1;
     h = -1;
     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
 }
 
 wxRect wxRegion::GetBox() const