use int instead of size_t for a couple member variables

it's simpler, and there is no point in using size_t anyway since they are assigned from ints

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

diff --git a/include/wx/gtk/region.h b/include/wx/gtk/region.h
index 9fbbba8ea2eaf376925ea0b499f43ef8915cee77..a00a0af6740924bae69db12ddad1c6401db99d8c 100644 (file)
--- a/include/wx/gtk/region.h
+++ b/include/wx/gtk/region.h
@@ -122,13 +122,11 @@ private:
     void Init();
     void CreateRects( const wxRegion& r );
 
     void Init();
     void CreateRects( const wxRegion& r );
 

-    size_t   m_current;

     wxRegion m_region;
     wxRegion m_region;

-

     wxRect *m_rects;
     wxRect *m_rects;

-    size_t  m_numRects;
+    int m_numRects;
+    int m_current;

 
 

-private:

     DECLARE_DYNAMIC_CLASS(wxRegionIterator)
 };
 
     DECLARE_DYNAMIC_CLASS(wxRegionIterator)
 };
 

diff --git a/src/gtk/region.cpp b/src/gtk/region.cpp
index cf1d5d363bec152a98610d8ace9f75db54d30137..1f22346b7bff2b2e27750bee89d12e2d6af2fa01 100644 (file)
--- a/src/gtk/region.cpp
+++ b/src/gtk/region.cpp
@@ -370,15 +370,13 @@ void wxRegionIterator::CreateRects( const wxRegion& region )
     if (!gdkregion)
         return;
 
     if (!gdkregion)
         return;
 

-    GdkRectangle *gdkrects = NULL;
-    gint numRects = 0;
-    gdk_region_get_rectangles( gdkregion, &gdkrects, &numRects );
+    GdkRectangle* gdkrects;
+    gdk_region_get_rectangles(gdkregion, &gdkrects, &m_numRects);

 
 

-    m_numRects = numRects;
-    if (numRects)
+    if (m_numRects)

     {
         m_rects = new wxRect[m_numRects];
     {
         m_rects = new wxRect[m_numRects];

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

         {
             GdkRectangle &gr = gdkrects[i];
             wxRect &wr = m_rects[i];
         {
             GdkRectangle &gr = gdkrects[i];
             wxRect &wr = m_rects[i];


@@ -467,7 +465,7 @@ wxRegionIterator& wxRegionIterator::operator=(const wxRegionIterator& ri)
     if ( m_numRects )
     {
         m_rects = new wxRect[m_numRects];
     if ( m_numRects )
     {
         m_rects = new wxRect[m_numRects];

-        for ( unsigned int n = 0; n < m_numRects; n++ )
+        for ( int n = 0; n < m_numRects; n++ )

             m_rects[n] = ri.m_rects[n];
     }
     else
             m_rects[n] = ri.m_rects[n];
     }
     else