X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4004f41e3ce1655f9fa05c55a697ac0f8677c23a..7ac05a91abea459438b8ea62074108d3daf39568:/src/msw/statbmp.cpp?ds=inline

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 909a09c532..11b4cd0791 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -85,6 +85,12 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     // be ignored by Windows
     wxIcon *icon = (wxIcon *)NULL;
     m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
+
+#ifdef __WIN16__
+    wxASSERT_MSG( !m_isIcon, "Icons are not supported in wxStaticBitmap under WIN16." );
+#endif
+
+#ifndef __WIN16__
     if ( !m_isIcon )
     {
         const wxBitmap& bmp = (const wxBitmap&)bitmap;
@@ -97,6 +103,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
             m_isIcon = TRUE;
         }
     }
+#endif
 
 #ifdef __WIN32__
     // create a static control with either SS_BITMAP or SS_ICON style depending
@@ -108,11 +115,16 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 
+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        winstyle |= WS_CLIPSIBLINGS;
+
+
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,
                         wxT(""),
-                        winstyle | WS_CHILD | WS_VISIBLE | WS_DISABLED,
+                        // NOT DISABLED!!! We want to move it in Dialog Editor.
+                        winstyle | WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */ , // | WS_DISABLED,
                         0, 0, 0, 0,
                         (HWND)parent->GetHWND(),
                         (HMENU)m_windowId,