X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..0ecd03525b34edba886ca83ff724265cd912dbbd:/include/wx/msw/statbmp.h?ds=sidebyside diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 883b52ae37..9466edf512 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -16,10 +16,10 @@ #include "wx/icon.h" #include "wx/bitmap.h" -extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: wxStaticBitmap() { Init(); } @@ -54,9 +54,11 @@ public: 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 wxSize DoGetBestClientSize() const; // ctor/dtor helpers void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; } @@ -68,6 +70,13 @@ protected: void SetImage(const wxGDIImage* image); void SetImageNoCopy( wxGDIImage* image ); +#ifndef __WXWINCE__ + // 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); +#endif // !__WXWINCE__ + + // we can have either an icon or a bitmap bool m_isIcon; wxGDIImage *m_image; @@ -77,7 +86,7 @@ protected: private: DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - DECLARE_NO_COPY_CLASS(wxStaticBitmap) + wxDECLARE_NO_COPY_CLASS(wxStaticBitmap); }; #endif