Support Unicode module names in wxDynamicLibrary::MSWGetModuleHandle().

[wxWidgets.git] / src / msw / bitmap.cpp

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 05d24b6d82a14afe822c7baa8f9e1d3e16ea309e..0cd514ffd12aae239bd07a92d5fe815643a984ab 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -1173,13 +1173,6 @@ wxMask *wxBitmap::GetMask() const
     return GetBitmapData() ? GetBitmapData()->GetMask() : NULL;
 }
 
     return GetBitmapData() ? GetBitmapData()->GetMask() : NULL;
 }
 

-wxBitmap wxMask::GetBitmap() const
-{
-    wxBitmap bmp;
-    bmp.SetHBITMAP(m_maskBitmap);
-    return bmp;
-}
-

 wxDC *wxBitmap::GetSelectedInto() const
 {
 #if wxDEBUG_LEVEL
 wxDC *wxBitmap::GetSelectedInto() const
 {
 #if wxDEBUG_LEVEL


@@ -1547,6 +1540,13 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 #endif // __WXMICROWIN__/!__WXMICROWIN__
 }
 
 #endif // __WXMICROWIN__/!__WXMICROWIN__
 }
 

+wxBitmap wxMask::GetBitmap() const
+{
+    wxBitmap bmp;
+    bmp.SetHBITMAP(m_maskBitmap);
+    return bmp;
+}
+

 // ----------------------------------------------------------------------------
 // wxBitmapHandler
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxBitmapHandler
 // ----------------------------------------------------------------------------