X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..be19c556083cc197be55acbd05db76ec6dc2e0c4:/include/wx/statbmp.h diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h index 49bcf7fb93..b188edce7b 100644 --- a/include/wx/statbmp.h +++ b/include/wx/statbmp.h @@ -12,41 +12,45 @@ #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; - -WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr; +extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[]; // a control showing an icon or a bitmap -class WXDLLEXPORT wxStaticBitmapBase : public wxControl +class WXDLLIMPEXP_CORE 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; + 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; } + // overridden base class virtuals + virtual bool AcceptsFocus() const { return false; } + virtual bool HasTransparentBackground() { return true; } protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + virtual wxSize DoGetBestSize() const; - DECLARE_NO_COPY_CLASS(wxStaticBitmapBase) + wxDECLARE_NO_COPY_CLASS(wxStaticBitmapBase); }; #if defined(__WXUNIVERSAL__) @@ -55,10 +59,12 @@ protected: #include "wx/msw/statbmp.h" #elif defined(__WXMOTIF__) #include "wx/motif/statbmp.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/statbmp.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/statbmp.h" #elif defined(__WXMAC__) - #include "wx/mac/statbmp.h" + #include "wx/osx/statbmp.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/statbmp.h" #elif defined(__WXPM__)