X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42e69d6b435a4dd5415caf3750db62cf45b6f373..8b99adf475af713c192933dd9a011db8b2030f34:/include/wx/msw/statbmp.h diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 1d0b3fb809..e412b276ad 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -17,8 +17,9 @@ #endif #include "wx/control.h" +#include "wx/icon.h" -WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr; +WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmap : public wxControl @@ -83,9 +84,7 @@ protected: wxBitmap *bitmap; } m_image; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); + virtual wxSize DoGetBestSize(); }; #endif