compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
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;
|
||||
|
||||
|
@@ -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
|
||||
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;
|
||||
|
||||
|
Reference in New Issue
Block a user