projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup of previous fix
[wxWidgets.git]
/
include
/
wx
/
motif
/
statbmp.h
diff --git
a/include/wx/motif/statbmp.h
b/include/wx/motif/statbmp.h
index b6674c046bc20db2dfa226df71b678aa3f7b80ab..11d8fbb9b71ae1a3bbc5ba8ed05d241cb1d91ac7 100644
(file)
--- a/
include/wx/motif/statbmp.h
+++ b/
include/wx/motif/statbmp.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: statbmp.h
+// Name:
wx/motif/
statbmp.h
// Purpose: wxStaticBitmap class
// Author: Julian Smart
// Modified by:
// Purpose: wxStaticBitmap class
// Author: Julian Smart
// Modified by:
@@
-12,54
+12,48
@@
#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 WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
{
{
-DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
public:
wxStaticBitmap() { }
public:
wxStaticBitmap() { }
- ~wxStaticBitmap();
+
virtual
~wxStaticBitmap();
wxStaticBitmap(wxWindow *parent, wxWindowID id,
wxStaticBitmap(wxWindow *parent, wxWindowID id,
-
const wxBitmap& label,
-
const wxPoint& pos = wxDefaultPosition,
-
const wxSize& size = wxDefaultSize,
-
long style = 0,
-
const wxString& name = wxStaticBitmapNameStr)
+ const wxBitmap& label,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxString& name = wxStaticBitmapNameStr)
{
Create(parent, id, label, pos, size, style, name);
}
bool Create(wxWindow *parent, wxWindowID id,
{
Create(parent, id, label, pos, size, style, name);
}
bool Create(wxWindow *parent, wxWindowID id,
-
const wxBitmap& label,
-
const wxPoint& pos = wxDefaultPosition,
-
const wxSize& size = wxDefaultSize,
-
long style = 0,
-
const wxString& name = wxStaticBitmapNameStr);
+ const wxBitmap& label,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxString& name = wxStaticBitmapNameStr);
virtual void SetBitmap(const wxBitmap& bitmap);
virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
{
virtual void SetBitmap(const wxBitmap& bitmap);
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,17
+62,18
@@
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();
+protected:
+ void DoSetBitmap();
+
protected:
wxBitmap m_messageBitmap;
protected:
wxBitmap m_messageBitmap;
+ wxBitmap m_messageBitmapOriginal;
+ wxBitmapCache m_bitmapCache;
};
#endif
};
#endif
-
// _WX_STATBMP_H_
+// _WX_STATBMP_H_