X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fe41ce6250fd9ba3632f532574e671839afb595..e5dbea4951e809331c76118c69026f6c44faf9c4:/include/wx/msw/statbmp.h diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index db39bbb7bc..ba61d269ef 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 @@ -52,11 +52,13 @@ public: virtual wxBitmap GetBitmap() const; virtual wxIcon GetIcon() const; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; + + // returns true if the platform should explicitly apply a theme border + virtual bool CanApplyThemeBorder() const { return false; } protected: - virtual wxBorder GetDefaultBorder() const; virtual wxSize DoGetBestSize() const; - virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; // ctor/dtor helpers void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }