More small fixes

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index e9ceb4890b328156bb2923d81234616b6f57df79..f51c590ce6900871319c77fb04b736557d9f4724 100644 (file)
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_STATBMP
+

 #include "wx/window.h"
 #include "wx/msw/private.h"
 
 #include "wx/window.h"
 #include "wx/msw/private.h"
 


@@ -42,7 +44,7 @@
 // macors
 // ---------------------------------------------------------------------------
 
 // macors
 // ---------------------------------------------------------------------------
 

-    IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)

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


@@ -80,8 +82,31 @@ 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


@@ -92,11 +117,16 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 
     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 

+    if ( m_windowStyle & wxCLIP_SIBLINGS )
+        winstyle |= WS_CLIPSIBLINGS;
+
+

     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,
                         wxT(""),
     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,
                         0, 0, 0, 0,
                         (HWND)parent->GetHWND(),
                         (HMENU)m_windowId,


@@ -106,7 +136,8 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
 
 
     wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
 

-    SetImage(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);


@@ -137,15 +168,25 @@ wxSize wxStaticBitmap::DoGetBestSize() const
     return wxWindow::DoGetBestSize();
 }
 
     return wxWindow::DoGetBestSize();
 }
 

-void wxStaticBitmap::SetImage(const wxGDIImage& 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 = new wxIcon((const wxIcon&)bitmap);
+    {
+        m_image = new wxIcon(*icon);
+    }

     else
     else

-        m_image = new wxBitmap((const 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;


@@ -160,8 +201,8 @@ void wxStaticBitmap::SetImage(const wxGDIImage& bitmap)
 
     if ( ImageIsOk() )
     {
 
     if ( ImageIsOk() )
     {

-        int width = bitmap.GetWidth(),
-            height = bitmap.GetHeight();
+        int width = image->GetWidth(),
+            height = image->GetHeight();

         if ( width && height )
         {
             w = width;
         if ( width && height )
         {
             w = width;


@@ -185,7 +226,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;
 


@@ -214,7 +257,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)


@@ -226,4 +271,5 @@ long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }

-#endif // Win16
+
+#endif // wxUSE_STATBMP