X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8bffc1335b021848d2947530213e4ef119226fc..bbc1265c400d44962621a6b2c7c36ccff097207c:/src/msw/statbmp.cpp

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index a93d50a7a5..fa803fe344 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
@@ -90,33 +90,16 @@ static wxGDIImage* ConvertImage( const wxGDIImage& bitmap )
 
 #endif
 
-bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
+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);
-
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
-
-    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;
+    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
@@ -127,53 +110,46 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 #ifdef __WIN16__
     wxASSERT_MSG( !m_isIcon, "Icons are not supported in wxStaticBitmap under WIN16." );
     image = &bitmap;
-#endif
-
-#ifndef __WIN16__
+#else // Win32
     image = ConvertImage( bitmap );
     m_isIcon = image->IsKindOf( CLASSINFO(wxIcon) );
-#endif
+#endif // Win16/32
 
+    // create the native control
+    if ( !MSWCreateControl(
 #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
-    const wxChar *classname = wxT("BUTTON");
-    int winstyle = BS_OWNERDRAW;
-#endif // Win32
-
-    if ( m_windowStyle & wxCLIP_SIBLINGS )
-        winstyle |= WS_CLIPSIBLINGS;
-
-
-    m_hWnd = (WXHWND)::CreateWindow
-                       (
-                        classname,
-                        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,
-                        wxGetInstance(),
-                        NULL
-                       );
-
-    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
+                           _T("BUTTON"),
+#endif // Win32/16
+                           _T(""), pos, size) )
+    {
+        // control creation failed
+        return FALSE;
+    }
 
     // no need to delete the new image
-    SetImageNoCopy( image );
+    SetImageNoCopy(image);
+
+    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