wxStaticBitmap::GetIcon() added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -43,20 +43,33 @@ class wxStaticBitmap: public wxControl
|
|||||||
{
|
{
|
||||||
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
|
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
wxStaticBitmap();
|
||||||
|
wxStaticBitmap( wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxBitmap& label,
|
||||||
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
|
const wxSize& size = wxDefaultSize,
|
||||||
|
long style = 0,
|
||||||
|
const wxString& name = wxStaticBitmapNameStr );
|
||||||
|
bool Create( wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxBitmap& label,
|
||||||
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
|
const wxSize& size = wxDefaultSize,
|
||||||
|
long style = 0,
|
||||||
|
const wxString& name = wxStaticBitmapNameStr);
|
||||||
|
|
||||||
wxStaticBitmap(void);
|
|
||||||
wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap& label,
|
|
||||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
|
||||||
long style = 0, const wxString& name = wxStaticBitmapNameStr );
|
|
||||||
bool Create( wxWindow *parent, wxWindowID id, 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 void SetBitmap( const wxBitmap& bitmap );
|
||||||
wxBitmap& GetBitmap(void) const { return (wxBitmap&)m_bitmap; }
|
|
||||||
|
|
||||||
private:
|
wxBitmap& GetBitmap() { return m_bitmap; }
|
||||||
|
const wxBitmap& GetBitmap() const { return m_bitmap; }
|
||||||
|
|
||||||
|
// for compatibility with wxMSW
|
||||||
|
wxIcon& GetIcon()
|
||||||
|
{ return *(wxDynamicCast(&m_bitmap, wxIcon)); }
|
||||||
|
|
||||||
|
private:
|
||||||
wxBitmap m_bitmap;
|
wxBitmap m_bitmap;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -43,20 +43,33 @@ class wxStaticBitmap: public wxControl
|
|||||||
{
|
{
|
||||||
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
|
DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
wxStaticBitmap();
|
||||||
|
wxStaticBitmap( wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxBitmap& label,
|
||||||
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
|
const wxSize& size = wxDefaultSize,
|
||||||
|
long style = 0,
|
||||||
|
const wxString& name = wxStaticBitmapNameStr );
|
||||||
|
bool Create( wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxBitmap& label,
|
||||||
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
|
const wxSize& size = wxDefaultSize,
|
||||||
|
long style = 0,
|
||||||
|
const wxString& name = wxStaticBitmapNameStr);
|
||||||
|
|
||||||
wxStaticBitmap(void);
|
|
||||||
wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap& label,
|
|
||||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
|
||||||
long style = 0, const wxString& name = wxStaticBitmapNameStr );
|
|
||||||
bool Create( wxWindow *parent, wxWindowID id, 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 void SetBitmap( const wxBitmap& bitmap );
|
||||||
wxBitmap& GetBitmap(void) const { return (wxBitmap&)m_bitmap; }
|
|
||||||
|
|
||||||
private:
|
wxBitmap& GetBitmap() { return m_bitmap; }
|
||||||
|
const wxBitmap& GetBitmap() const { return m_bitmap; }
|
||||||
|
|
||||||
|
// for compatibility with wxMSW
|
||||||
|
wxIcon& GetIcon()
|
||||||
|
{ return *(wxDynamicCast(&m_bitmap, wxIcon)); }
|
||||||
|
|
||||||
|
private:
|
||||||
wxBitmap m_bitmap;
|
wxBitmap m_bitmap;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user