X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..5b12cceef870243338e39d4b15536008491de474:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 02f5c7ef05..c54f627313 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -26,7 +26,7 @@ class WXDLLEXPORT wxIcon; class WXDLLEXPORT wxBitmap; -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr; // a control showing an icon or a bitmap class WXDLLEXPORT wxStaticBitmapBase : public wxControl @@ -34,17 +34,18 @@ class WXDLLEXPORT wxStaticBitmapBase : public wxControl public: wxStaticBitmapBase() { } virtual ~wxStaticBitmapBase(); - + // our interface virtual void SetIcon(const wxIcon& icon) = 0; virtual void SetBitmap(const wxBitmap& bitmap) = 0; virtual wxBitmap GetBitmap() const = 0; // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } + virtual bool AcceptsFocus() const { return false; } + virtual bool HasTransparentBackground() { return true; } protected: - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestSize() const; DECLARE_NO_COPY_CLASS(wxStaticBitmapBase) };