projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to avoid accidental use of wxXmlNode in XRC handlers.
[wxWidgets.git]
/
include
/
wx
/
univ
/
statbmp.h
diff --git
a/include/wx/univ/statbmp.h
b/include/wx/univ/statbmp.h
index 940827f806dad40958053ace76eefe57d54cd7b7..2c9e011547fa92366c7172696d4490d32f0fdf0a 100644
(file)
--- 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_
#ifndef _WX_UNIV_STATBMP_H_
#define _WX_UNIV_STATBMP_H_
-#ifdef __GNUG__
- #pragma interface "statbmp.h"
-#endif
-
#include "wx/bitmap.h"
// ----------------------------------------------------------------------------
// wxStaticBitmap
// ----------------------------------------------------------------------------
#include "wx/bitmap.h"
// ----------------------------------------------------------------------------
// wxStaticBitmap
// ----------------------------------------------------------------------------
-class wxStaticBitmap : public wxStaticBitmapBase
+class
WXDLLIMPEXP_CORE
wxStaticBitmap : public wxStaticBitmapBase
{
public:
wxStaticBitmap()
{
public:
wxStaticBitmap()
@@
-35,7
+31,7
@@
public:
const wxSize& size = wxDefaultSize,
long style = 0)
{
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,
}
wxStaticBitmap(wxWindow *parent,
@@
-63,9
+59,12
@@
public:
wxIcon GetIcon() const;
wxIcon GetIcon() const;
-private:
+ virtual bool HasTransparentBackground() { return true; }
+
+protected:
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer);
+private:
// the bitmap which we show
wxBitmap m_bitmap;
// the bitmap which we show
wxBitmap m_bitmap;