X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16cba29d3a5a0a95b367382311a4a7a9a9833210..48e5284db6d6f1dab46a81a4ae0d0438ea37bd6e:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index e0e4566370..80b4d2dcf8 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -12,19 +12,13 @@ #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" - -class WXDLLEXPORT wxIcon; -class WXDLLEXPORT wxBitmap; +#include "wx/icon.h" extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr; @@ -39,9 +33,16 @@ 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; } + virtual bool HasTransparentBackground() { return true; } protected: virtual wxSize DoGetBestSize() const;