compilation fix

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

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index 29738710f4c590329550ce39b2a2eebd9ae13e9e..a7e059c40c8bef06ca3960270feaa5485d3506b4 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -682,10 +682,10 @@ wxImage wxBitmap::ConvertToImage() const
 {
     // the colour used as transparent one in wxImage and the one it is replaced
     // with when it really occurs in the bitmap
 {
     // the colour used as transparent one in wxImage and the one it is replaced
     // with when it really occurs in the bitmap

-    static const MASK_RED = 1;
-    static const MASK_GREEN = 2;
-    static const MASK_BLUE = 3;
-    static const MASK_BLUE_REPLACEMENT = 2;
+    static const int MASK_RED = 1;
+    static const int MASK_GREEN = 2;
+    static const int MASK_BLUE = 3;
+    static const int MASK_BLUE_REPLACEMENT = 2;

 
     wxImage image;
 
 
     wxImage image;
 

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index 29738710f4c590329550ce39b2a2eebd9ae13e9e..a7e059c40c8bef06ca3960270feaa5485d3506b4 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -682,10 +682,10 @@ wxImage wxBitmap::ConvertToImage() const
 {
     // the colour used as transparent one in wxImage and the one it is replaced
     // with when it really occurs in the bitmap
 {
     // the colour used as transparent one in wxImage and the one it is replaced
     // with when it really occurs in the bitmap

-    static const MASK_RED = 1;
-    static const MASK_GREEN = 2;
-    static const MASK_BLUE = 3;
-    static const MASK_BLUE_REPLACEMENT = 2;
+    static const int MASK_RED = 1;
+    static const int MASK_GREEN = 2;
+    static const int MASK_BLUE = 3;
+    static const int MASK_BLUE_REPLACEMENT = 2;

 
     wxImage image;
 
 
     wxImage image;