X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a047aff270905b377a81657a90f92eb3297157d0..09b67c660cadef225cbf8f1986cfe591f8feae8c:/include/wx/msw/statbmp.h?ds=sidebyside diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 7086e812dd..f510de3a3f 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -16,7 +16,7 @@ #include "wx/icon.h" #include "wx/bitmap.h" -extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[]; +extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase @@ -58,7 +58,6 @@ public: virtual bool CanApplyThemeBorder() const { return false; } protected: - virtual wxBorder GetDefaultBorder() const; virtual wxSize DoGetBestSize() const; // ctor/dtor helpers @@ -71,6 +70,11 @@ protected: void SetImage(const wxGDIImage* image); void SetImageNoCopy( wxGDIImage* image ); + // draw the bitmap ourselves here if the OS can't do it correctly (if it + // can we leave it to it) + void DoPaintManually(wxPaintEvent& event); + + // we can have either an icon or a bitmap bool m_isIcon; wxGDIImage *m_image;