X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60acae65faac4b98254c76437d4bb9ac55f5d759..bdbd4e96121a470b518420cff4c2dfea20f2b7a6:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index c54f627313..bdd278fd07 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -12,21 +12,15 @@ #ifndef _WX_STATBMP_H_BASE_ #define _WX_STATBMP_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "statbmpbase.h" -#endif - #include "wx/defs.h" #if wxUSE_STATBMP #include "wx/control.h" #include "wx/bitmap.h" +#include "wx/icon.h" -class WXDLLEXPORT wxIcon; -class WXDLLEXPORT wxBitmap; - -extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmapBase : public wxControl @@ -39,6 +33,12 @@ public: virtual void SetIcon(const wxIcon& icon) = 0; virtual void SetBitmap(const wxBitmap& bitmap) = 0; virtual wxBitmap GetBitmap() const = 0; + virtual wxIcon GetIcon() const /* = 0 -- should be pure virtual */ + { + // stub it out here for now as not all ports implement it (but they + // should) + return wxIcon(); + } // overriden base class virtuals virtual bool AcceptsFocus() const { return false; }