fixes bug 414369

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 200e920bd85e28294c65ca7880f58ea12495d825..fd9dd5db304d3526f232b9b67c2a87361333c27b 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -42,9 +42,7 @@
 // macors
 // ---------------------------------------------------------------------------
 
 // macors
 // ---------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -55,7 +53,7 @@
 // ---------------------------------------------------------------------------
 
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 // ---------------------------------------------------------------------------
 
 bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,

-                            const wxBitmap& bitmap,
+                            const wxGDIImage& bitmap,

                             const wxPoint& pos,
                             const wxSize& size,
                             long style,
                             const wxPoint& pos,
                             const wxSize& size,
                             long style,


@@ -82,23 +80,47 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style;
 
 
     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
+    wxIcon *icon = (wxIcon *)NULL;

     m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
 
     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;
+        wxMask *mask = bmp.GetMask();
+        if ( mask && mask->GetMaskBitmap() )
+        {
+            icon = new wxIcon;
+            icon->CopyFromBitmap(bmp);
+
+            m_isIcon = TRUE;
+        }
+    }
+#endif
+

 #ifdef __WIN32__
     // create a static control with either SS_BITMAP or SS_ICON style depending
     // on what we have here
 #ifdef __WIN32__
     // create a static control with either SS_BITMAP or SS_ICON style depending
     // on what we have here

-    const wxChar *classname = _T("STATIC");
+    const wxChar *classname = wxT("STATIC");

     int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
 #else // Win16
     int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
 #else // Win16

-    const wxChar *classname = _T("BUTTON");
+    const wxChar *classname = wxT("BUTTON");

     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,
     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,

-                        _T(""),
-                        winstyle | WS_CHILD | WS_VISIBLE,
+                        wxT(""),
+                        // 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,
                         0, 0, 0, 0,
                         (HWND)parent->GetHWND(),
                         (HMENU)m_windowId,


@@ -106,9 +128,10 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                         NULL
                        );
 
                         NULL
                        );
 

-    wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create static bitmap") );
+    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );

 
 

-    SetBitmap(bitmap);
+    SetImage(icon ? icon : &bitmap);
+    delete icon; // may be NULL, ok

 
     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);
 
     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);


@@ -122,40 +145,42 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
 bool wxStaticBitmap::ImageIsOk() const
 {
 
 bool wxStaticBitmap::ImageIsOk() const
 {

-    if ( m_isIcon && m_image.icon )
-        return m_image.icon->Ok();
-    else if ( m_image.bitmap )
-        return m_image.bitmap->Ok();
-    else
-        return FALSE;
+    return m_image && m_image->Ok();

 }
 
 void wxStaticBitmap::Free()
 {
 }
 
 void wxStaticBitmap::Free()
 {

-    if ( m_isIcon )
-        delete m_image.icon;
-    else
-        delete m_image.bitmap;
+    delete m_image;

 
 

-    m_image.icon = NULL;
+    m_image = NULL;

 }
 
 }
 

-wxSize wxStaticBitmap::DoGetBestSize()
+wxSize wxStaticBitmap::DoGetBestSize() const

 {
     // reuse the current size (as wxWindow does) instead of using some
     // arbitrary default size (as wxControl, our immediate base class, does)
     return wxWindow::DoGetBestSize();
 }
 
 {
     // reuse the current size (as wxWindow does) instead of using some
     // arbitrary default size (as wxControl, our immediate base class, does)
     return wxWindow::DoGetBestSize();
 }
 

-void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
+void wxStaticBitmap::SetImage(const wxGDIImage* image)

 {
     Free();
 
 {
     Free();
 

-    m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
+    const wxIcon *icon = wxDynamicCast(image, wxIcon);
+    m_isIcon = icon != NULL;

     if ( m_isIcon )
     if ( m_isIcon )

-        m_image.icon = new wxIcon((const wxIcon&)bitmap);
+    {
+        m_image = new wxIcon(*icon);
+    }

     else
     else

-        m_image.bitmap = new wxBitmap(bitmap);
+    {
+        wxASSERT_MSG( wxDynamicCast(image, wxBitmap),
+                      _T("not an icon and not a bitmap?") );
+
+        const wxBitmap *bitmap = (wxBitmap *)image;
+
+        m_image = new wxBitmap(*bitmap);
+    }

 
     int x, y;
     int w, h;
 
     int x, y;
     int w, h;


@@ -163,27 +188,30 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
     GetSize(&w, &h);
 
 #ifdef __WIN32__
     GetSize(&w, &h);
 
 #ifdef __WIN32__

-    HANDLE handle = m_isIcon ? (HANDLE)m_image.icon->GetHICON()
-                             : (HANDLE)m_image.bitmap->GetHBITMAP();
-    ::SendMessage((HWND)m_hWnd, STM_SETIMAGE,
+    HANDLE handle = (HANDLE)m_image->GetHandle();
+    ::SendMessage(GetHwnd(), STM_SETIMAGE,

                   m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
 #endif // Win32
 
     if ( ImageIsOk() )
     {
                   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;
             h = height;
 
         if ( width && height )
         {
             w = width;
             h = height;
 

-            ::MoveWindow((HWND)GetHWND(), x, y, width, height, FALSE);
+            ::MoveWindow(GetHwnd(), x, y, width, height, FALSE);

         }
     }
 
         }
     }
 

-    RECT rect = { x, y, x + w, y + h };
-    InvalidateRect((HWND)GetParent()->GetHWND(), &rect, TRUE);
+    RECT rect;
+    rect.left   = x;
+    rect.top    = y;
+    rect.right  = x + w;
+    rect.bottom = y + h;
+    InvalidateRect(GetHwndOf(GetParent()), &rect, TRUE);

 }
 
 // under Win32 we use the standard static control style for this
 }
 
 // under Win32 we use the standard static control style for this


@@ -192,7 +220,9 @@ bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 {
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 
 {
     LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) item;
 

-    wxBitmap* bitmap = m_image.bitmap;
+    wxCHECK_MSG( !m_isIcon, FALSE, _T("icons not supported in wxStaticBitmap") );
+
+    wxBitmap* bitmap = (wxBitmap *)m_image;

     if ( !bitmap->Ok() )
         return FALSE;
 
     if ( !bitmap->Ok() )
         return FALSE;
 


@@ -221,7 +251,9 @@ bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
     return TRUE;
 }
 
     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)
 long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
                                    WXWPARAM wParam,
                                    WXLPARAM lParam)


@@ -233,4 +265,4 @@ long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }

-#endif // Win16
+