getting rid of warnings

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

diff --git a/src/mac/carbon/stattext.cpp b/src/mac/carbon/stattext.cpp
index bc89591282b5d28ef79cfb8737eefe15150d0884..5509db4dddea933a0b659ce26fed1884933ade79 100644 (file)
--- a/src/mac/carbon/stattext.cpp
+++ b/src/mac/carbon/stattext.cpp
@@ -76,7 +76,6 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
 
   int x = 0 ;
 
 
   int x = 0 ;
 

-  int i = 0 ;

   bool linedrawn = true;
   while( paragraph.Length() > 0 )
   {
   bool linedrawn = true;
   while( paragraph.Length() > 0 )
   {


@@ -157,7 +156,7 @@ void wxStaticText::OnDraw( wxDC &dc )
   }
 
   wxString paragraph;
   }
 
   wxString paragraph;

-  int i = 0 ;
+  size_t i = 0 ;

   wxString text = m_label;
   int y = 0 ;
   while (i < text.Length())
   wxString text = m_label;
   int y = 0 ;
   while (i < text.Length())

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 27cd473d3684c5e03def144709a2a2944164cda2..6bd7d0b114db8bd87e21ef5d95b0663a7a25a666 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -202,7 +202,7 @@ bool wxToolBar::Realize()
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->Data();
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->Data();

-        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
+//        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;

         
         if(  !tool->IsSeparator()  )
         {
         
         if(  !tool->IsSeparator()  )
         {


@@ -328,7 +328,7 @@ wxSize wxToolBar::GetToolSize() const
 
 void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
 
 void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {

-    int index = 0 ;
+    size_t index = 0 ;

     for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
     {
         if ( m_macToolHandles[index] == (void*) control )
     for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
     {
         if ( m_macToolHandles[index] == (void*) control )


@@ -394,7 +394,7 @@ void wxToolBar::MacSuperChangedPosition()
         while (node)
         {
             wxToolBarTool *tool = (wxToolBarTool *)node->Data();
         while (node)
         {
             wxToolBarTool *tool = (wxToolBarTool *)node->Data();

-            wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
+ //           wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;

             
             if(  !tool->IsSeparator()  )
             {
             
             if(  !tool->IsSeparator()  )
             {


@@ -479,7 +479,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
     MacClientToRootWindow( &x , &y ) ;
     Point pt = { y ,x } ;
 
     MacClientToRootWindow( &x , &y ) ;
     Point pt = { y ,x } ;
 

-    int index = 0 ;
+    size_t index = 0 ;

     for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
     {
         if ( m_macToolHandles[index] )
     for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
     {
         if ( m_macToolHandles[index] )


@@ -566,7 +566,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
         dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
     UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
     {
         dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
     UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
     {

-        int index = 0 ;
+        size_t index = 0 ;

         for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
         {
             if ( m_macToolHandles[index] )
         for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
         {
             if ( m_macToolHandles[index] )

diff --git a/src/mac/stattext.cpp b/src/mac/stattext.cpp
index bc89591282b5d28ef79cfb8737eefe15150d0884..5509db4dddea933a0b659ce26fed1884933ade79 100644 (file)
--- a/src/mac/stattext.cpp
+++ b/src/mac/stattext.cpp
@@ -76,7 +76,6 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
 
   int x = 0 ;
 
 
   int x = 0 ;
 

-  int i = 0 ;

   bool linedrawn = true;
   while( paragraph.Length() > 0 )
   {
   bool linedrawn = true;
   while( paragraph.Length() > 0 )
   {


@@ -157,7 +156,7 @@ void wxStaticText::OnDraw( wxDC &dc )
   }
 
   wxString paragraph;
   }
 
   wxString paragraph;

-  int i = 0 ;
+  size_t i = 0 ;

   wxString text = m_label;
   int y = 0 ;
   while (i < text.Length())
   wxString text = m_label;
   int y = 0 ;
   while (i < text.Length())

diff --git a/src/mac/toolbar.cpp b/src/mac/toolbar.cpp
index 27cd473d3684c5e03def144709a2a2944164cda2..6bd7d0b114db8bd87e21ef5d95b0663a7a25a666 100644 (file)
--- a/src/mac/toolbar.cpp
+++ b/src/mac/toolbar.cpp
@@ -202,7 +202,7 @@ bool wxToolBar::Realize()
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->Data();
     while (node)
     {
         wxToolBarTool *tool = (wxToolBarTool *)node->Data();

-        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
+//        wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;

         
         if(  !tool->IsSeparator()  )
         {
         
         if(  !tool->IsSeparator()  )
         {


@@ -328,7 +328,7 @@ wxSize wxToolBar::GetToolSize() const
 
 void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
 
 void wxToolBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {

-    int index = 0 ;
+    size_t index = 0 ;

     for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
     {
         if ( m_macToolHandles[index] == (void*) control )
     for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
     {
         if ( m_macToolHandles[index] == (void*) control )


@@ -394,7 +394,7 @@ void wxToolBar::MacSuperChangedPosition()
         while (node)
         {
             wxToolBarTool *tool = (wxToolBarTool *)node->Data();
         while (node)
         {
             wxToolBarTool *tool = (wxToolBarTool *)node->Data();

-            wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;
+ //           wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetNormalBitmap().GetRefData()) ;

             
             if(  !tool->IsSeparator()  )
             {
             
             if(  !tool->IsSeparator()  )
             {


@@ -479,7 +479,7 @@ wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
     MacClientToRootWindow( &x , &y ) ;
     Point pt = { y ,x } ;
 
     MacClientToRootWindow( &x , &y ) ;
     Point pt = { y ,x } ;
 

-    int index = 0 ;
+    size_t index = 0 ;

     for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
     {
         if ( m_macToolHandles[index] )
     for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
     {
         if ( m_macToolHandles[index] )


@@ -566,7 +566,7 @@ void wxToolBar::OnPaint(wxPaintEvent& event)
         dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
     UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
     {
         dc.YLOG2DEVMAC(m_height) , dc.XLOG2DEVMAC(m_width) } ;
     UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
     {

-        int index = 0 ;
+        size_t index = 0 ;

         for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
         {
             if ( m_macToolHandles[index] )
         for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
         {
             if ( m_macToolHandles[index] )