From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 24 Aug 2002 17:20:12 +0000 (+0000)
Subject: getting rid of warnings
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8140eec95a05a0a56ea7f79d6d78e5e92669f26e?ds=inline

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 3d2690803c..52b07f6e60 100644
--- 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 )
 				{
-					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 ;
@@ -582,7 +582,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
 				}
 				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 ;
@@ -601,7 +601,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
 			}
 			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 ;
diff --git a/src/mac/carbon/scrolbar.cpp b/src/mac/carbon/scrolbar.cpp
index 075c1efc8a..9073f70995 100644
--- a/src/mac/carbon/scrolbar.cpp
+++ b/src/mac/carbon/scrolbar.cpp
@@ -15,6 +15,11 @@
 
 #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"
 
@@ -134,12 +139,15 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
 			break ;
+                default :
+                        wxLogError(_("illegal scrollbar selector %d"), controlpart);
+                        break ;
 	}
 
   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 )
diff --git a/src/mac/pnghand.cpp b/src/mac/pnghand.cpp
index 3d2690803c..52b07f6e60 100644
--- a/src/mac/pnghand.cpp
+++ b/src/mac/pnghand.cpp
@@ -538,7 +538,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
 			{
 				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 ;
@@ -582,7 +582,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
 				}
 				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 ;
@@ -601,7 +601,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
 			}
 			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 ;
diff --git a/src/mac/scrolbar.cpp b/src/mac/scrolbar.cpp
index 075c1efc8a..9073f70995 100644
--- a/src/mac/scrolbar.cpp
+++ b/src/mac/scrolbar.cpp
@@ -15,6 +15,11 @@
 
 #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"
 
@@ -134,12 +139,15 @@ void wxScrollBar::MacHandleControlClick( WXWidget control , wxInt16 controlpart
         nScrollInc = 0 ;
         scrollEvent = wxEVT_SCROLL_THUMBTRACK;
 			break ;
+                default :
+                        wxLogError(_("illegal scrollbar selector %d"), controlpart);
+                        break ;
 	}
 
   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 )