getting rid of warnings

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

diff --git a/src/mac/carbon/pnghand.cpp b/src/mac/carbon/pnghand.cpp
index 3d2690803c0779d77e550a6cf9d8e0a3e31fc2bc..52b07f6e600227ebe5ba3b31c500000c76e0edce 100644 (file)
--- a/src/mac/carbon/pnghand.cpp
+++ b/src/mac/carbon/pnghand.cpp
@@ -538,7 +538,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
                        {
                                if ( pixel_depth == 8 )
                                {
                        {
                                if ( pixel_depth == 8 )
                                {

-                                       for ( int i = 0 ; i < info_ptr->width ; ++i )
+                                       for ( size_t i = 0 ; i < info_ptr->width ; ++i )

                                        {
                                                png_color_struct* color ; 
                                                RGBColor col ;
                                        {
                                                png_color_struct* color ; 
                                                RGBColor col ;


@@ -582,7 +582,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
                                }
                                else
                                {
                                }
                                else
                                {

-                                       for ( int i = 0 ; i < info_ptr->width ; ++i )
+                                       for ( size_t i = 0 ; i < info_ptr->width ; ++i )

                                        {
                                                png_color_struct* color ; 
                                                RGBColor col ;
                                        {
                                                png_color_struct* color ; 
                                                RGBColor col ;


@@ -601,7 +601,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
                        }
                        else
                        {
                        }
                        else
                        {

-                               for ( int i = 0 ; i < info_ptr->width ; ++i )
+                               for ( size_t i = 0 ; i < info_ptr->width ; ++i )

                                {
                                        png_color_struct* color ; 
                                        RGBColor col ;
                                {
                                        png_color_struct* color ; 
                                        RGBColor col ;

diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 075c1efc8a7505ab58ed946d1e89f8ea94b9537a..9073f709950fc0ee6524d7426ee36369a7bdba67 100644 (file)
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -15,6 +15,11 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

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

 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 


@@ -134,12 +139,15 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
                        break ;
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
                        break ;

+                default :
+                        wxLogError(_("illegal scrollbar selector %d"), controlpart);
+                        break ;

        }
 
   int new_pos = position + nScrollInc;
 
        }
 
   int new_pos = position + nScrollInc;
 

-  if (new_pos < 0)
-      new_pos = 0;
+  if (new_pos < minPos)
+      new_pos = minPos;

   if (new_pos > maxPos)
       new_pos = maxPos;
        if ( nScrollInc )
   if (new_pos > maxPos)
       new_pos = maxPos;
        if ( nScrollInc )

diff --git a/src/mac/pnghand.cpp b/src/mac/pnghand.cpp
index 3d2690803c0779d77e550a6cf9d8e0a3e31fc2bc..52b07f6e600227ebe5ba3b31c500000c76e0edce 100644 (file)
--- a/src/mac/pnghand.cpp
+++ b/src/mac/pnghand.cpp
@@ -538,7 +538,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
                        {
                                if ( pixel_depth == 8 )
                                {
                        {
                                if ( pixel_depth == 8 )
                                {

-                                       for ( int i = 0 ; i < info_ptr->width ; ++i )
+                                       for ( size_t i = 0 ; i < info_ptr->width ; ++i )

                                        {
                                                png_color_struct* color ; 
                                                RGBColor col ;
                                        {
                                                png_color_struct* color ; 
                                                RGBColor col ;


@@ -582,7 +582,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
                                }
                                else
                                {
                                }
                                else
                                {

-                                       for ( int i = 0 ; i < info_ptr->width ; ++i )
+                                       for ( size_t i = 0 ; i < info_ptr->width ; ++i )

                                        {
                                                png_color_struct* color ; 
                                                RGBColor col ;
                                        {
                                                png_color_struct* color ; 
                                                RGBColor col ;


@@ -601,7 +601,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
                        }
                        else
                        {
                        }
                        else
                        {

-                               for ( int i = 0 ; i < info_ptr->width ; ++i )
+                               for ( size_t i = 0 ; i < info_ptr->width ; ++i )

                                {
                                        png_color_struct* color ; 
                                        RGBColor col ;
                                {
                                        png_color_struct* color ; 
                                        RGBColor col ;

diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index 075c1efc8a7505ab58ed946d1e89f8ea94b9537a..9073f709950fc0ee6524d7426ee36369a7bdba67 100644 (file)
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -15,6 +15,11 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

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

 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 
 #include "wx/scrolbar.h"
 #include "wx/mac/uma.h"
 


@@ -134,12 +139,15 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
                        break ;
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
                        break ;

+                default :
+                        wxLogError(_("illegal scrollbar selector %d"), controlpart);
+                        break ;

        }
 
   int new_pos = position + nScrollInc;
 
        }
 
   int new_pos = position + nScrollInc;
 

-  if (new_pos < 0)
-      new_pos = 0;
+  if (new_pos < minPos)
+      new_pos = minPos;

   if (new_pos > maxPos)
       new_pos = maxPos;
        if ( nScrollInc )
   if (new_pos > maxPos)
       new_pos = maxPos;
        if ( nScrollInc )