X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fe41ce6250fd9ba3632f532574e671839afb595..63ab3daed955b52885e75daeab6088564f9e64d2:/src/msw/statbmp.cpp diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index c321fe5f73..cd03008f89 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/msw/statbmp.cpp // Purpose: wxStaticBitmap // Author: Julian Smart // Modified by: @@ -26,14 +26,15 @@ #if wxUSE_STATBMP -#include "wx/window.h" -#include "wx/msw/private.h" +#include "wx/statbmp.h" #ifndef WX_PRECOMP + #include "wx/window.h" #include "wx/icon.h" - #include "wx/statbmp.h" #endif +#include "wx/msw/private.h" + #include "wx/sysopt.h" #include @@ -165,7 +166,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, SetImageNoCopy(image); // GetBestSize will work properly now, so set the best size if needed - SetBestSize(size); + SetInitialSize(size); return true; } @@ -276,9 +277,9 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) if (m_currentHandle != 0 && oldHandle != (HGDIOBJ) m_currentHandle) { // the static control made a copy and we are responsible for deleting it - DeleteObject((HGDIOBJ) oldHandle); + DeleteObject((HGDIOBJ) oldHandle); } - m_currentHandle = (WXHANDLE)handle; + m_currentHandle = (WXHANDLE)handle; #endif // Win32 if ( ImageIsOk() ) @@ -303,4 +304,3 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) } #endif // wxUSE_STATBMP -