X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58a33cb4e6e2de9d6ea6da16b52e53d840797059..a1925afc905df6260036832e58d2f3919caad03f:/src/msw/statbmp.cpp

diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp
index 7c5c1397d6..200e920bd8 100644
--- a/src/msw/statbmp.cpp
+++ b/src/msw/statbmp.cpp
@@ -28,12 +28,15 @@
     #pragma hdrstop
 #endif
 
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
+    #include "wx/icon.h"
     #include "wx/statbmp.h"
 #endif
 
 #include <stdio.h>
-#include "wx/msw/private.h"
 
 // ---------------------------------------------------------------------------
 // macors
@@ -84,17 +87,17 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 #ifdef __WIN32__
     // create a static control with either SS_BITMAP or SS_ICON style depending
     // on what we have here
-    const char *classname = "STATIC";
+    const wxChar *classname = _T("STATIC");
     int winstyle = m_isIcon ? SS_ICON : SS_BITMAP;
 #else // Win16
-    const char *classname = "BUTTON";
+    const wxChar *classname = _T("BUTTON");
     int winstyle = BS_OWNERDRAW;
 #endif // Win32
 
     m_hWnd = (WXHWND)::CreateWindow
                        (
                         classname,
-                        "",
+                        _T(""),
                         winstyle | WS_CHILD | WS_VISIBLE,
                         0, 0, 0, 0,
                         (HWND)parent->GetHWND(),
@@ -103,7 +106,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
                         NULL
                        );
 
-    wxCHECK_MSG( m_hWnd, FALSE, "Failed to create static bitmap" );
+    wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create static bitmap") );
 
     SetBitmap(bitmap);
 
@@ -137,39 +140,11 @@ void wxStaticBitmap::Free()
     m_image.icon = NULL;
 }
 
-void wxStaticBitmap::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+wxSize wxStaticBitmap::DoGetBestSize()
 {
-    int currentX, currentY;
-    GetPosition(&currentX, &currentY);
-    int x1 = x;
-    int y1 = y;
-
-    if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        x1 = currentX;
-    if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        y1 = currentY;
-
-    AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
-    int actualWidth = width;
-    int actualHeight = height;
-
-    int ww, hh;
-    GetSize(&ww, &hh);
-
-    // If we're prepared to use the existing width, then...
-    if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
-        actualWidth = ww;
-    else
-        actualWidth = width;
-
-    // If we're prepared to use the existing height, then...
-    if (height == -1 && ((sizeFlags & wxSIZE_AUTO_HEIGHT) != wxSIZE_AUTO_HEIGHT))
-        actualHeight = hh;
-    else
-        actualHeight = height;
-
-    MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
+    // 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)
@@ -186,7 +161,6 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
     int w, h;
     GetPosition(&x, &y);
     GetSize(&w, &h);
-    RECT rect = { x, y, x + w, y + h };
 
 #ifdef __WIN32__
     HANDLE handle = m_isIcon ? (HANDLE)m_image.icon->GetHICON()
@@ -201,10 +175,14 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
             height = bitmap.GetHeight();
         if ( width && height )
         {
+            w = width;
+            h = height;
+
             ::MoveWindow((HWND)GetHWND(), x, y, width, height, FALSE);
         }
     }
 
+    RECT rect = { x, y, x + w, y + h };
     InvalidateRect((HWND)GetParent()->GetHWND(), &rect, TRUE);
 }