Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxStaticBitmap::GetIcon() added

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-21 21:29:40 +00:00
parent 0f90ec9365
commit 7f24bd194b
2 changed files with 60 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
include/wx/gtk/statbmp.h
View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -41,23 +41,36 @@ extern const char* wxStaticBitmapNameStr;
class wxStaticBitmap: public wxControl class wxStaticBitmap: public wxControl
{ {
DECLARE_DYNAMIC_CLASS(wxStaticBitmap) DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
public: public:
wxStaticBitmap();
wxStaticBitmap(void); wxStaticBitmap( wxWindow *parent,
wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap& label, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxBitmap& label,
long style = 0, const wxString& name = wxStaticBitmapNameStr ); const wxPoint& pos = wxDefaultPosition,
bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& label, const wxSize& size = wxDefaultSize,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
long style = 0, const wxString& name = wxStaticBitmapNameStr); 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; }
wxBitmap& GetBitmap() { return m_bitmap; }
private: const wxBitmap& GetBitmap() const { return m_bitmap; }
wxBitmap m_bitmap; // for compatibility with wxMSW
wxIcon& GetIcon()
{ return *(wxDynamicCast(&m_bitmap, wxIcon)); }
private:
wxBitmap m_bitmap;
}; };
#endif #endif

47
include/wx/gtk1/statbmp.h
View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
// Copyright: (c) 1998 Robert Roebling // Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@@ -41,23 +41,36 @@ extern const char* wxStaticBitmapNameStr;
class wxStaticBitmap: public wxControl class wxStaticBitmap: public wxControl
{ {
DECLARE_DYNAMIC_CLASS(wxStaticBitmap) DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
public: public:
wxStaticBitmap();
wxStaticBitmap(void); wxStaticBitmap( wxWindow *parent,
wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap& label, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxBitmap& label,
long style = 0, const wxString& name = wxStaticBitmapNameStr ); const wxPoint& pos = wxDefaultPosition,
bool Create( wxWindow *parent, wxWindowID id, const wxBitmap& label, const wxSize& size = wxDefaultSize,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
long style = 0, const wxString& name = wxStaticBitmapNameStr); 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; }
wxBitmap& GetBitmap() { return m_bitmap; }
private: const wxBitmap& GetBitmap() const { return m_bitmap; }
wxBitmap m_bitmap; // for compatibility with wxMSW
wxIcon& GetIcon()
{ return *(wxDynamicCast(&m_bitmap, wxIcon)); }
private:
wxBitmap m_bitmap;
}; };
#endif #endif