X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40964ef0f9fe111c4e38a34a3a691b31e18ec209..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/univ/statbmp.h diff --git a/include/wx/univ/statbmp.h b/include/wx/univ/statbmp.h index 0a69f1e236..2c9e011547 100644 --- a/include/wx/univ/statbmp.h +++ b/include/wx/univ/statbmp.h @@ -12,17 +12,13 @@ #ifndef _WX_UNIV_STATBMP_H_ #define _WX_UNIV_STATBMP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univstatbmp.h" -#endif - #include "wx/bitmap.h" // ---------------------------------------------------------------------------- // wxStaticBitmap // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase +class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase { public: wxStaticBitmap() @@ -35,7 +31,7 @@ public: const wxSize& size = wxDefaultSize, long style = 0) { - Create(parent, -1, label, pos, size, style); + Create(parent, wxID_ANY, label, pos, size, style); } wxStaticBitmap(wxWindow *parent, @@ -63,11 +59,12 @@ public: wxIcon GetIcon() const; - virtual bool HasTransparentBackground() { return TRUE; } - -private: + virtual bool HasTransparentBackground() { return true; } + +protected: virtual void DoDraw(wxControlRenderer *renderer); +private: // the bitmap which we show wxBitmap m_bitmap;