Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added

wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-12-15 17:54:20 +00:00
parent d6906a06a2
commit 8f884a0dcc
161 changed files with 1244 additions and 1139 deletions

View File

@@ -12,16 +12,14 @@
#ifndef _WX_CURSOR_H_
#define _WX_CURSOR_H_
#include "wx/object.h"
#include "wx/gdiobj.h"
#include "wx/gdicmn.h"
class WXDLLIMPEXP_FWD_CORE wxImage;
// Cursor
class WXDLLEXPORT wxCursor: public wxObject
class WXDLLEXPORT wxCursor : public wxGDIObject
{
DECLARE_DYNAMIC_CLASS(wxCursor)
public:
wxCursor();
@@ -39,12 +37,14 @@ public:
wxCursor(wxStockCursor id);
virtual ~wxCursor();
virtual bool Ok() const { return IsOk(); }
virtual bool IsOk() const;
// Motif-specific.
// Create/get a cursor for the current display
WXCursor GetXCursor(WXDisplay* display) const;
protected:
virtual wxGDIRefData *CreateGDIRefData() const;
virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
private:
void Create(const char bits[], int width, int height,
int hotSpotX = -1, int hotSpotY = -1,
@@ -53,6 +53,8 @@ private:
// Make a cursor from standard id
WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;
DECLARE_DYNAMIC_CLASS(wxCursor)
};
extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);