documented Set/GetIcon(), added (not quite pure) virtual GetIcon() in the base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,9 +18,7 @@
|
||||
|
||||
#include "wx/control.h"
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
class WXDLLEXPORT wxIcon;
|
||||
class WXDLLEXPORT wxBitmap;
|
||||
#include "wx/icon.h"
|
||||
|
||||
extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr;
|
||||
|
||||
@@ -35,6 +33,12 @@ public:
|
||||
virtual void SetIcon(const wxIcon& icon) = 0;
|
||||
virtual void SetBitmap(const wxBitmap& bitmap) = 0;
|
||||
virtual wxBitmap GetBitmap() const = 0;
|
||||
virtual wxIcon GetIcon() const /* = 0 -- should be pure virtual */
|
||||
{
|
||||
// stub it out here for now as not all ports implement it (but they
|
||||
// should)
|
||||
return wxIcon();
|
||||
}
|
||||
|
||||
// overriden base class virtuals
|
||||
virtual bool AcceptsFocus() const { return false; }
|
||||
|
Reference in New Issue
Block a user