X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4304b42f1a1a586e96c645cb47d1cd3c98e3dec6..ce195ee63259e9a70136adef1ddcec4132647f96:/include/wx/msw/statbmp.h diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h index 85308a7d13..31462f585d 100644 --- a/include/wx/msw/statbmp.h +++ b/include/wx/msw/statbmp.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.h -// Purpose: wxStaticBitmap class +// Name: wx/msw/statbmp.h +// Purpose: wxStaticBitmap class for wxMSW // Author: Julian Smart // Modified by: // Created: 01/02/97 @@ -12,7 +12,7 @@ #ifndef _WX_STATBMP_H_ #define _WX_STATBMP_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "statbmp.h" #endif @@ -23,10 +23,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; // a control showing an icon or a bitmap -class WXDLLEXPORT wxStaticBitmap : public wxControl +class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase { - DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - public: wxStaticBitmap() { Init(); } @@ -38,6 +36,8 @@ public: long style = 0, const wxString& name = wxStaticBitmapNameStr) { + Init(); + Create(parent, id, label, pos, size, style, name); } @@ -51,39 +51,53 @@ public: virtual ~wxStaticBitmap() { Free(); } - void SetIcon(const wxIcon& icon) { SetImage(icon); } - void SetBitmap(const wxBitmap& bitmap) { SetImage(bitmap); } + virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); } + virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); } // assert failure is provoked by an attempt to get an icon from bitmap or // vice versa - const wxIcon& GetIcon() const - { wxASSERT( m_isIcon ); return *(wxIcon *)m_image; } - const wxBitmap& GetBitmap() const - { wxASSERT( !m_isIcon ); return *(wxBitmap *)m_image; } + wxIcon GetIcon() const + { + wxASSERT_MSG( m_isIcon, _T("no icon in this wxStaticBitmap") ); + + return *(wxIcon *)m_image; + } - // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } + wxBitmap GetBitmap() const + { + wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") ); + + return *(wxBitmap *)m_image; + } - // IMPLEMENTATION -#ifdef __WIN16__ - virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item); - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -#endif // __WIN16__ + // implementation only from now on + // ------------------------------- + + // implement base class virtuals + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); protected: + virtual wxBorder GetDefaultBorder() const; virtual wxSize DoGetBestSize() const; + virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; - void Init() { m_isIcon = TRUE; m_image = NULL; } + // ctor/dtor helpers + void Init() { m_isIcon = true; m_image = NULL; } void Free(); - // TRUE if icon/bitmap is valid + // true if icon/bitmap is valid bool ImageIsOk() const; - void SetImage(const wxGDIImage& image); + void SetImage(const wxGDIImage* image); + void SetImageNoCopy( wxGDIImage* image ); // we can have either an icon or a bitmap bool m_isIcon; wxGDIImage *m_image; + +private: + DECLARE_DYNAMIC_CLASS(wxStaticBitmap) + DECLARE_NO_COPY_CLASS(wxStaticBitmap) }; #endif