/////////////////////////////////////////////////////////////////////////////
-// Name: statbmp.cpp
+// Name: src/msw/statbmp.cpp
// Purpose: wxStaticBitmap
// Author: Julian Smart
// Modified by:
#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 <stdio.h>
SetImageNoCopy(image);
// GetBestSize will work properly now, so set the best size if needed
- SetBestSize(size);
+ SetInitialSize(size);
return true;
}
m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle);
// detect if this is still the handle we passed before or
// if the static-control made a copy of the bitmap!
- if (m_currentHandle != 0 && oldHandle != m_currentHandle)
+ if (m_currentHandle != 0 && oldHandle != (HGDIOBJ) m_currentHandle)
{
// the static control made a copy and we are responsible for deleting it
- DeleteObject(oldHandle);
+ DeleteObject((HGDIOBJ) oldHandle);
}
- m_currentHandle = (HGDIOBJ)handle;
+ m_currentHandle = (WXHANDLE)handle;
#endif // Win32
if ( ImageIsOk() )
}
#endif // wxUSE_STATBMP
-