X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e3e08210272082c5fcd427d14ebde86f60002a0..de3131e78406c3d8a4fb5c1fdf91fbeccfe63f73:/include/wx/msw/statbmp.h diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 42cb47350a..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 @@ -63,9 +64,6 @@ public: virtual bool AcceptsFocus() const { return FALSE; } // IMPLEMENTATION - virtual void Command(wxCommandEvent& WXUNUSED(event)) { } - virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { } - #ifdef __WIN16__ virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); @@ -86,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