got rid of wxWindow::m_lDlgCode - now wxWANTS_CHARS style should work for all windows...

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index da32aead681f8571f625018d05bed2823bf6dc2a..a93d50a7a5077e4e815e3327b83f08ecf15e64e7 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_STATBMP
+
 #include "wx/window.h"
 #include "wx/msw/private.h"
 
@@ -42,7 +44,7 @@
 // macors
 // ---------------------------------------------------------------------------
 
-    IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 
 // ===========================================================================
 // implementation
@@ -52,6 +54,42 @@
 // wxStaticBitmap
 // ---------------------------------------------------------------------------
 
+// we may have either bitmap or icon: if a bitmap with mask is passed, we
+// will transform it to an icon ourselves because otherwise the mask will
+// be ignored by Windows
+// note that this function will create a new object every time
+// it is called even if the image needs no conversion
+
+#ifndef __WIN16__
+
+static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )
+{
+    bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) );
+
+    if( !isIcon )
+    {
+        wxASSERT_MSG( wxDynamicCast(&bitmap, wxBitmap),
+                      _T("not an icon and not a bitmap?") );
+
+        const wxBitmap& bmp = (const wxBitmap&)bitmap;
+        wxMask *mask = bmp.GetMask();
+        if ( mask && mask->GetMaskBitmap() )
+        {
+            wxIcon* icon = new wxIcon;
+            icon->CopyFromBitmap(bmp);
+
+            return icon;
+        }
+
+        return new wxBitmap( bmp );
+    }
+
+    // copying a bitmap is a cheap operation
+    return new wxIcon( (const wxIcon&)bitmap );
+}
+
+#endif
+
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                             const wxGDIImage& bitmap,
                             const wxPoint& pos,
@@ -80,8 +118,22 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style;
 
+    // we may have either bitmap or icon: if a bitmap with mask is passed, we
+    // will transform it to an icon ourselves because otherwise the mask will
+    // be ignored by Windows
+    wxGDIImage *image = (wxGDIImage *)NULL;
     m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
 
+#ifdef __WIN16__
+    wxASSERT_MSG( !m_isIcon, "Icons are not supported in wxStaticBitmap under WIN16." );
+    image = &bitmap;
+#endif
+
+#ifndef __WIN16__
+    image = ConvertImage( bitmap );
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+#endif
+
 #ifdef __WIN32__
     // create a static control with either SS_BITMAP or SS_ICON style depending
     // on what we have here
@@ -92,11 +144,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,
+                        // 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,
@@ -106,7 +163,8 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
 
-    SetImage(bitmap);
+    // no need to delete the new image
+    SetImageNoCopy( image );
 
     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);
@@ -137,15 +195,19 @@ wxSize wxStaticBitmap::DoGetBestSize() const
     return wxWindow::DoGetBestSize();
 }
 
-void wxStaticBitmap::SetImage(const wxGDIImage& bitmap)
+void wxStaticBitmap::SetImage( const wxGDIImage* image )
+{
+    wxGDIImage* convertedImage = ConvertImage( *image );
+    SetImageNoCopy( convertedImage );
+}
+
+void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
 {
     Free();
 
-    m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
-    if ( m_isIcon )
-        m_image = new wxIcon((const wxIcon&)bitmap);
-    else
-        m_image = new wxBitmap((const wxBitmap &)bitmap);
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+    // the image has already been copied
+    m_image = image;
 
     int x, y;
     int w, h;
@@ -154,14 +216,17 @@ void wxStaticBitmap::SetImage(const wxGDIImage& bitmap)
 
 #ifdef __WIN32__
     HANDLE handle = (HANDLE)m_image->GetHandle();
+    LONG style = ::GetWindowLong( (HWND)GetHWND(), GWL_STYLE ) ;
+    ::SetWindowLong( (HWND)GetHWND(), GWL_STYLE, ( style & ~( SS_BITMAP|SS_ICON ) ) |
+                     ( m_isIcon ? SS_ICON : SS_BITMAP ) );
     ::SendMessage(GetHwnd(), STM_SETIMAGE,
                   m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
 #endif // Win32
 
     if ( ImageIsOk() )
     {
-        int width = bitmap.GetWidth(),
-            height = bitmap.GetHeight();
+        int width = image->GetWidth(),
+            height = image->GetHeight();
         if ( width && height )
         {
             w = width;
@@ -216,7 +281,9 @@ bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
     return TRUE;
 }
+#endif // Win16
 
+// We need this or the control can never be moved e.g. in Dialog Editor.
 long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
                                    WXWPARAM wParam,
                                    WXLPARAM lParam)
@@ -228,4 +295,5 @@ long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
-#endif // Win16
+
+#endif // wxUSE_STATBMP