X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd3f686c274a264e89ea97505350a82c1134f307..cfb7687556620cc0a558c9dab3f582de31369e67:/src/msw/statbmp.cpp diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index 0725df9d88..980476bfde 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -84,13 +84,13 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, // Subclass again for purposes of dialog editing mode SubclassWin(m_hWnd); - SetFont(* GetParent()->GetFont()); + SetFont(GetParent()->GetFont()); SetSize(x, y, width, height); return TRUE; } -void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags) +void wxStaticBitmap::DoSetSize(int x, int y, int width, int height, int sizeFlags) { int currentX, currentY; GetPosition(¤tX, ¤tY); @@ -144,7 +144,7 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap) bool wxStaticBitmap::MSWOnDraw(WXDRAWITEMSTRUCT *item) { long style = GetWindowLong((HWND) GetHWND(), GWL_STYLE); -#ifdef __WIN32__ +#if defined(__WIN32__) && defined(SS_BITMAP) if ((style & 0xFF) == SS_BITMAP) { // Should we call Default() here?