Better scrolling to cursor.

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

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 2f54f08674ce4c368af38db30a08d7cc6600838d..52dc1c5bbca412444616b014b8aeb25e125965a4 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"
 


@@ -52,88 +54,102 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 // wxStaticBitmap
 // ---------------------------------------------------------------------------
 
 // wxStaticBitmap
 // ---------------------------------------------------------------------------
 

-bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
-                            const wxGDIImage& bitmap,
-                            const wxPoint& pos,
-                            const wxSize& size,
-                            long style,
-                            const wxString& name)
-{
-    Init();
-
-    SetName(name);
-    if (parent)
-        parent->AddChild(this);
+// 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

 
 

-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
+#ifndef __WIN16__

 
 

-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
-
-    m_windowStyle = style;
+static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )
+{
+    bool isIcon = bitmap.IsKindOf( CLASSINFO(wxIcon) );

 
 

-    // 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));
-    if ( !m_isIcon )
+    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() )
         {
         const wxBitmap& bmp = (const wxBitmap&)bitmap;
         wxMask *mask = bmp.GetMask();
         if ( mask && mask->GetMaskBitmap() )
         {

-            icon = new wxIcon;
+            wxIcon* icon = new wxIcon;

             icon->CopyFromBitmap(bmp);
 
             icon->CopyFromBitmap(bmp);
 

-            m_isIcon = TRUE;
+            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,
+                            const wxSize& size,
+                            long style,
+                            const wxString& name)
+{
+    if ( !CreateControl(parent, id, pos, size, style, wxDefaultValidator, name) )
+        return FALSE;
+
+    // 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;
+#else // Win32
+    image = ConvertImage( bitmap );
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+#endif // Win16/32
+
+    // create the native control
+    if ( !MSWCreateControl(

 #ifdef __WIN32__
 #ifdef __WIN32__

-    // create a static control with either SS_BITMAP or SS_ICON style depending
-    // on what we have here
-    const wxChar *classname = wxT("STATIC");
-    int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
+                           _T("STATIC"),

 #else // Win16
 #else // Win16

-    const wxChar *classname = wxT("BUTTON");
-    int winstyle = BS_OWNERDRAW;
-#endif // Win32
-
-    m_hWnd = (WXHWND)::CreateWindow
-                       (
-                        classname,
-                        wxT(""),
-                        // NOT DISABLED!!! We want to move it in Dialog Editor.
-                        winstyle | WS_CHILD | WS_VISIBLE, // | WS_DISABLED,
-                        0, 0, 0, 0,
-                        (HWND)parent->GetHWND(),
-                        (HMENU)m_windowId,
-                        wxGetInstance(),
-                        NULL
-                       );
+                           _T("BUTTON"),
+#endif // Win32/16
+                           _T(""), pos, size) )
+    {
+        // control creation failed
+        return FALSE;
+    }

 
 

-    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
+    // no need to delete the new image
+    SetImageNoCopy(image);

 
 

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

 
 

-    // Subclass again for purposes of dialog editing mode
-    SubclassWin(m_hWnd);
+WXDWORD wxStaticBitmap::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);

 
 

-    SetFont(GetParent()->GetFont());
+#ifdef __WIN32__
+    // what kind of control are we?
+    msStyle |= m_isIcon ? SS_ICON : SS_BITMAP;

 
 

-    SetSize(x, y, width, height);
+    // we use SS_CENTERIMAGE to prevent the control from resizing the bitmap to
+    // fit to its size -- this is unexpected and doesn't happen in other ports
+    msStyle |= SS_CENTERIMAGE;
+#else // Win16
+    msStyle |= BS_OWNERDRAW;
+#endif // Win32/16

 
 

-    return TRUE;
+    return msStyle;

 }
 
 bool wxStaticBitmap::ImageIsOk() const
 }
 
 bool wxStaticBitmap::ImageIsOk() const


@@ -155,25 +171,19 @@ wxSize wxStaticBitmap::DoGetBestSize() const
     return wxWindow::DoGetBestSize();
 }
 
     return wxWindow::DoGetBestSize();
 }
 

-void wxStaticBitmap::SetImage(const wxGDIImage* image)
+void wxStaticBitmap::SetImage( const wxGDIImage* image )

 {
 {

-    Free();
-
-    const wxIcon *icon = wxDynamicCast(image, wxIcon);
-    m_isIcon = icon != NULL;
-    if ( m_isIcon )
-    {
-        m_image = new wxIcon(*icon);
-    }
-    else
-    {
-        wxASSERT_MSG( wxDynamicCast(image, wxBitmap),
-                      _T("not an icon and not a bitmap?") );
+    wxGDIImage* convertedImage = ConvertImage( *image );
+    SetImageNoCopy( convertedImage );
+}

 
 

-        const wxBitmap *bitmap = (wxBitmap *)image;
+void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
+{
+    Free();

 
 

-        m_image = new wxBitmap(*bitmap);
-    }
+    m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
+    // the image has already been copied
+    m_image = image;

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


@@ -182,6 +192,9 @@ void wxStaticBitmap::SetImage(const wxGDIImage* image)
 
 #ifdef __WIN32__
     HANDLE handle = (HANDLE)m_image->GetHandle();
 
 #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
     ::SendMessage(GetHwnd(), STM_SETIMAGE,
                   m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
 #endif // Win32


@@ -259,3 +272,4 @@ long wxStaticBitmap::MSWWindowProc(WXUINT nMsg,
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
     return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 

+#endif // wxUSE_STATBMP