Don't use DDEExec registry key in wxMSW wxExecute() if it's empty.

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 05d24b6d82a14afe822c7baa8f9e1d3e16ea309e..61ad4d25f879f2815e390a81b274a7825e7b3bd8 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -1173,13 +1172,6 @@ wxMask *wxBitmap::GetMask() const
     return GetBitmapData() ? GetBitmapData()->GetMask() : NULL;
 }
 
-wxBitmap wxMask::GetBitmap() const
-{
-    wxBitmap bmp;
-    bmp.SetHBITMAP(m_maskBitmap);
-    return bmp;
-}
-
 wxDC *wxBitmap::GetSelectedInto() const
 {
 #if wxDEBUG_LEVEL
@@ -1547,6 +1539,13 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 #endif // __WXMICROWIN__/!__WXMICROWIN__
 }
 
+wxBitmap wxMask::GetBitmap() const
+{
+    wxBitmap bmp;
+    bmp.SetHBITMAP(m_maskBitmap);
+    return bmp;
+}
+
 // ----------------------------------------------------------------------------
 // wxBitmapHandler
 // ----------------------------------------------------------------------------