projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
define WINVER as 0x0400 for VC++ 6 because its headers give a warning if WINVER ...
[wxWidgets.git]
/
include
/
wx
/
univ
/
statbmp.h
diff --git
a/include/wx/univ/statbmp.h
b/include/wx/univ/statbmp.h
index 940827f806dad40958053ace76eefe57d54cd7b7..b449ce6ff4d1afaad28b13d5f8bd4b20adfab1b3 100644
(file)
--- a/
include/wx/univ/statbmp.h
+++ b/
include/wx/univ/statbmp.h
@@
-12,8
+12,8
@@
#ifndef _WX_UNIV_STATBMP_H_
#define _WX_UNIV_STATBMP_H_
#ifndef _WX_UNIV_STATBMP_H_
#define _WX_UNIV_STATBMP_H_
-#if
def __GNUG__
- #pragma interface "statbmp.h"
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+ #pragma interface "
univ
statbmp.h"
#endif
#include "wx/bitmap.h"
#endif
#include "wx/bitmap.h"
@@
-22,7
+22,7
@@
// wxStaticBitmap
// ----------------------------------------------------------------------------
// wxStaticBitmap
// ----------------------------------------------------------------------------
-class wxStaticBitmap : public wxStaticBitmapBase
+class
WXDLLEXPORT
wxStaticBitmap : public wxStaticBitmapBase
{
public:
wxStaticBitmap()
{
public:
wxStaticBitmap()
@@
-35,7
+35,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,6
+63,8
@@
public:
wxIcon GetIcon() const;
wxIcon GetIcon() const;
+ virtual bool HasTransparentBackground() { return true; }
+
private:
virtual void DoDraw(wxControlRenderer *renderer);
private:
virtual void DoDraw(wxControlRenderer *renderer);