X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65bc172c9776514d64ced1317709202ee4123cd8..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/msw/statbmp.h?ds=sidebyside diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 55e2aa35b7..9466edf512 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -12,18 +12,14 @@ #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#ifdef __GNUG__ - #pragma interface "statbmp.h" -#endif - #include "wx/control.h" #include "wx/icon.h" #include "wx/bitmap.h" -WXDLLEXPORT_DATA(extern 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(); } @@ -53,54 +49,44 @@ public: virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); } virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); } + virtual wxBitmap GetBitmap() const; + virtual wxIcon GetIcon() const; - // assert failure is provoked by an attempt to get an icon from bitmap or - // vice versa - wxIcon GetIcon() const - { - wxASSERT_MSG( m_isIcon, _T("no icon in this wxStaticBitmap") ); - - return *(wxIcon *)m_image; - } - - wxBitmap GetBitmap() const - { - wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") ); - - return *(wxBitmap *)m_image; - } - - // implementation only from now on - // ------------------------------- + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - // implement base class virtuals -#ifdef __WIN16__ - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); -#endif // __WIN16__ - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + // 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; + virtual wxSize DoGetBestClientSize() 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 + // true if icon/bitmap is valid bool ImageIsOk() const; 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