projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved MGL initialization to earlier stage (crashes otherwise...) and implemented...
[wxWidgets.git]
/
include
/
wx
/
os2
/
statbmp.h
diff --git
a/include/wx/os2/statbmp.h
b/include/wx/os2/statbmp.h
index 01ad8f183a6353663c714ff2a18535fcdfdb9a0e..116e25034d3f32f34548389168bfe2a0113db33b 100644
(file)
--- a/
include/wx/os2/statbmp.h
+++ b/
include/wx/os2/statbmp.h
@@
-21,9
+21,8
@@
WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
-class WXDLLEXPORT wxStaticBitmap
: public wxControl
+class WXDLLEXPORT wxStaticBitmap
: public wxStaticBitmapBase
{
{
- DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
public:
inline wxStaticBitmap() { Init(); }
public:
inline wxStaticBitmap() { Init(); }
@@
-56,7
+55,7
@@
class WXDLLEXPORT wxStaticBitmap: public wxControl
// vice versa
const wxIcon& GetIcon() const
{ wxASSERT( m_bIsIcon ); return *(wxIcon *)m_pImage; }
// vice versa
const wxIcon& GetIcon() const
{ wxASSERT( m_bIsIcon ); return *(wxIcon *)m_pImage; }
-
const wxBitmap&
GetBitmap() const
+
wxBitmap
GetBitmap() const
{ wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; }
// overriden base class virtuals
{ wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; }
// overriden base class virtuals
@@
-76,6
+75,8
@@
protected:
// we can have either an icon or a bitmap
bool m_bIsIcon;
wxGDIImage* m_pImage;
// we can have either an icon or a bitmap
bool m_bIsIcon;
wxGDIImage* m_pImage;
+private:
+ DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
};
#endif
};
#endif