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

corrections after wxUniv merge

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-06-28 21:23:41 +00:00
parent 7ef4c90b0a
commit 584bede061
9 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/mac/statbmp.h
View File

@@ -16,11 +16,9 @@
#pragma interface "statbmp.h"
#endif
#include "wx/control.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)
public:
@@ -50,8 +48,12 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
virtual void OnPaint( wxPaintEvent &event ) ;
void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
inline const wxBitmap& GetBitmap() const { return m_messageBitmap; }
const wxIcon& GetIcon() const { return (const wxIcon&) GetBitmap() ; }
wxBitmap GetBitmap() const { return m_bitmap; }
wxIcon GetIcon() const
{
// icons and bitmaps are really the same thing in wxMac
return (const wxIcon &)m_bitmap;
}
void SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
// overriden base class virtuals
@@ -59,7 +61,7 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
wxSize DoGetBestSize() const ;
protected:
wxBitmap m_messageBitmap;
wxBitmap m_bitmap;
DECLARE_EVENT_TABLE()
};