projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add virtual keyword where applicable.
[wxWidgets.git]
/
include
/
wx
/
motif
/
statbmp.h
diff --git
a/include/wx/motif/statbmp.h
b/include/wx/motif/statbmp.h
index ae5698036b68fbe6023754defb7ea1e3275b07c0..a8190f2a4f99e939543effbe4fe59ff62b2a6fda 100644
(file)
--- a/
include/wx/motif/statbmp.h
+++ b/
include/wx/motif/statbmp.h
@@
-12,16
+12,10
@@
#ifndef _WX_STATBMP_H_
#define _WX_STATBMP_H_
#ifndef _WX_STATBMP_H_
#define _WX_STATBMP_H_
-#ifdef __GNUG__
-#pragma interface "statbmp.h"
-#endif
-
-#include "wx/control.h"
+#include "wx/motif/bmpmotif.h"
#include "wx/icon.h"
#include "wx/icon.h"
-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
-
-class WXDLLEXPORT wxStaticBitmap : public wxControl
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
{
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
{
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
@@
-50,16
+44,16
@@
public:
virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
{
virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
{
- return
FALSE
;
+ return
false
;
}
}
- wxBitmap
& GetBitmap() const { return (wxBitmap&)
m_messageBitmap; }
+ wxBitmap
GetBitmap() const { return
m_messageBitmap; }
// for compatibility with wxMSW
// for compatibility with wxMSW
-
const wxIcon&
GetIcon() const
+
wxIcon
GetIcon() const
{
// don't use wxDynamicCast, icons and bitmaps are really the same thing
{
// don't use wxDynamicCast, icons and bitmaps are really the same thing
- return
(const wxIcon &)
m_messageBitmap;
+ return
*(wxIcon*)&
m_messageBitmap;
}
// for compatibility with wxMSW
}
// for compatibility with wxMSW
@@
-68,11
+62,7
@@
public:
SetBitmap( icon );
}
SetBitmap( icon );
}
- // overriden base class virtuals
- virtual bool AcceptsFocus() const { return FALSE; }
-
// Implementation
// Implementation
- virtual void ChangeFont(bool keepOriginalSize = TRUE);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
@@
-82,6
+72,7
@@
protected:
protected:
wxBitmap m_messageBitmap;
wxBitmap m_messageBitmapOriginal;
protected:
wxBitmap m_messageBitmap;
wxBitmap m_messageBitmapOriginal;
+ wxBitmapCache m_bitmapCache;
};
#endif
};
#endif