removed deprecated ConvertToBitmap() and wxImage(wxBitmap) ctor

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 7adde1d63e3a06484ac4d4162bc74bc2554083e3..db1d8b11d35f10aac847e1685220d7fdf4835183 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -98,6 +98,12 @@ bool wxStaticBitmap::Create(wxWindow *parent,
                             long style,
                             const wxString& name)
 {
+    // default border for this control is none
+    if ( (style & wxBORDER_MASK) == wxBORDER_DEFAULT )
+    {
+        style |= wxBORDER_NONE;
+    }
+    
     if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
         return FALSE;
 
@@ -122,7 +128,7 @@ bool wxStaticBitmap::Create(wxWindow *parent,
 #else // Win16
                            _T("BUTTON"),
 #endif // Win32/16
-                           _T(""), pos, size, style) )
+                           _T(""), pos, size) )
     {
         // control creation failed
         return FALSE;