compilation warning fixes

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

src/common/imagfill.cpp

@@ -17,13 +17,13 @@
     #pragma hdrstop
 #endif
 
-#include "wx/defs.h"
-
 #if wxUSE_IMAGE
 
 #include "wx/image.h"
+
+#ifndef WX_PRECOMP
     #include "wx/brush.h"
-#include "wx/pen.h"
+#endif
 
 // DoFloodFill
 // Fills with the colour extracted from fillBrush, starting at x,y until either

src/gtk/cursor.cpp

@@ -147,6 +147,7 @@ wxCursor::wxCursor( const wxCursor &cursor )
 }
 
 #if wxUSE_IMAGE
+
 wxCursor::wxCursor( const wxImage & image )
 {
     unsigned char * rgbBits = image.GetData();
@@ -155,7 +156,6 @@ wxCursor::wxCursor( const wxImage & image )
     bool bHasMask = image.HasMask();
     int imagebitcount = (w*h)/8;
 
-    unsigned char r, g, b ;
     unsigned char * bits = new unsigned char [imagebitcount];
     unsigned char * maskBits = new unsigned char [imagebitcount];
 
@@ -176,10 +176,13 @@ wxCursor::wxCursor( const wxImage & image )
             cMask = cMask * 2;
         }
     }
+
+    unsigned long keyMaskColor;
     if (bHasMask)
     {
-        r = image.GetMaskRed() ;
-        g = image.GetMaskGreen() ;
+        unsigned char
+            r = image.GetMaskRed(),
+            g = image.GetMaskGreen(),
             b = image.GetMaskBlue();
 
         for (i=0; i<imagebitcount; i++)
@@ -195,24 +198,26 @@ wxCursor::wxCursor( const wxImage & image )
                 cMask = cMask * 2;
             }
         }
+
+        keyMaskColor = (r << 16) | (g << 8) | b;
     }
-      else
+    else // no mask
     {
         for (i=0; i<imagebitcount; i++)
             maskBits[i] = 0xFF;
+
+        // init it to avoid compiler warnings
+        keyMaskColor = 0;
     }
-    //find the most frequent color(s)
-    //it seems a waste of effort to copy the image
-    //but otherwise we need to remove the const modifier ??
+
+    // find the most frequent color(s) it seems a waste of effort to copy the
+    // image but otherwise we need to remove the const modifier ??
     wxImage tmpImage = image.Copy();
     wxImageHistogram histogram;
 
     // colors as rrggbb
     unsigned long key;
     unsigned long value;
-    unsigned long keyMaskColor = 0;
-    if (bHasMask)
-        keyMaskColor = (r << 16) | (g << 8) | b;
 
     tmpImage.ComputeHistogram(histogram);
 
@@ -277,7 +282,8 @@ wxCursor::wxCursor( const wxImage & image )
     delete [] bits;
     delete [] maskBits;
 }
-#endif
+
+#endif // wxUSE_IMAGE
 
 wxCursor::~wxCursor()
 {

src/gtk/window.cpp

@@ -25,6 +25,7 @@
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
+#include "wx/module.h"
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"

src/gtk1/cursor.cpp

@@ -147,6 +147,7 @@ wxCursor::wxCursor( const wxCursor &cursor )
 }
 
 #if wxUSE_IMAGE
+
 wxCursor::wxCursor( const wxImage & image )
 {
     unsigned char * rgbBits = image.GetData();
@@ -155,7 +156,6 @@ wxCursor::wxCursor( const wxImage & image )
     bool bHasMask = image.HasMask();
     int imagebitcount = (w*h)/8;
 
-    unsigned char r, g, b ;
     unsigned char * bits = new unsigned char [imagebitcount];
     unsigned char * maskBits = new unsigned char [imagebitcount];
 
@@ -176,10 +176,13 @@ wxCursor::wxCursor( const wxImage & image )
             cMask = cMask * 2;
         }
     }
+
+    unsigned long keyMaskColor;
     if (bHasMask)
     {
-        r = image.GetMaskRed() ;
-        g = image.GetMaskGreen() ;
+        unsigned char
+            r = image.GetMaskRed(),
+            g = image.GetMaskGreen(),
             b = image.GetMaskBlue();
 
         for (i=0; i<imagebitcount; i++)
@@ -195,24 +198,26 @@ wxCursor::wxCursor( const wxImage & image )
                 cMask = cMask * 2;
             }
         }
+
+        keyMaskColor = (r << 16) | (g << 8) | b;
     }
-      else
+    else // no mask
     {
         for (i=0; i<imagebitcount; i++)
             maskBits[i] = 0xFF;
+
+        // init it to avoid compiler warnings
+        keyMaskColor = 0;
     }
-    //find the most frequent color(s)
-    //it seems a waste of effort to copy the image
-    //but otherwise we need to remove the const modifier ??
+
+    // find the most frequent color(s) it seems a waste of effort to copy the
+    // image but otherwise we need to remove the const modifier ??
     wxImage tmpImage = image.Copy();
     wxImageHistogram histogram;
 
     // colors as rrggbb
     unsigned long key;
     unsigned long value;
-    unsigned long keyMaskColor = 0;
-    if (bHasMask)
-        keyMaskColor = (r << 16) | (g << 8) | b;
 
     tmpImage.ComputeHistogram(histogram);
 
@@ -277,7 +282,8 @@ wxCursor::wxCursor( const wxImage & image )
     delete [] bits;
     delete [] maskBits;
 }
-#endif
+
+#endif // wxUSE_IMAGE
 
 wxCursor::~wxCursor()
 {

src/gtk1/window.cpp

@@ -25,6 +25,7 @@
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/msgdlg.h"
+#include "wx/module.h"
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"

src/unix/utilsx11.cpp

@@ -59,6 +59,12 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
                 gMask = image.GetMaskGreen();
                 bMask = image.GetMaskBlue();
             }
+            else // no mask, but still init the variables to avoid warnings
+            {
+                rMask =
+                gMask =
+                bMask = 0;
+            }
 
             *ptr++ = width;
             *ptr++ = height;