applied fix to fix BCC's wxBitmap ctor problem

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

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 0f98d1ffa451fe3dc8e89bcdb3c9d53788e307a4..82c55108c9c547dda615028d12c22c1691d02073 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -48,7 +48,7 @@ class WXDLLEXPORT wxString;
 // ---------------------------------------------------------------------------
 
 // Bitmap flags
-enum
+enum wxBitmapType
 {
     wxBITMAP_TYPE_INVALID,          // should be == 0 for compatibility!
     wxBITMAP_TYPE_BMP,

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index d96f86a163a3bf19679d7e9dd69cb0c2b8aa07ec..2aab4a41eee87034f901908b53899a10cb6ca5eb 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -83,7 +83,7 @@ public:
     wxBitmap(char **data) { CreateFromXpm((const char **)data); }
 
     // Load a file or resource
-    wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
+    wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
 
     // New constructor for generalised creation from data
     wxBitmap(void *data, long type, int width, int height, int depth = 1);

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 6bc9f47356b02b734d04c35d93629f2d9d83ee4b..0fe0be85c713c75294219be20373ae9d79ebe88b 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -302,7 +302,7 @@ wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
     (void)Create(data, type, width, height, depth);
 }
 
-wxBitmap::wxBitmap(const wxString& filename, long type)
+wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
 {
     Init();