X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a44fb285c5ba855d135090567eaa671df4462637..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/statbmp.h diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index d580d8a731..71cffec52b 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(); } @@ -52,14 +52,16 @@ 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; } + void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; } void Free(); // true if icon/bitmap is valid @@ -68,13 +70,23 @@ 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; + // handle used in last call to STM_SETIMAGE + WXHANDLE m_currentHandle; + private: DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - DECLARE_NO_COPY_CLASS(wxStaticBitmap) + wxDECLARE_NO_COPY_CLASS(wxStaticBitmap); }; #endif