projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed wxPGMultiButton (event handling, FinalizePosition() -> Finalize(), no longer...
[wxWidgets.git]
/
include
/
wx
/
motif
/
cursor.h
diff --git
a/include/wx/motif/cursor.h
b/include/wx/motif/cursor.h
index 2ef7e2dbdae880ab65a1f2c17222df94f5a22fb1..6bdf99270f0ce23ba2729975652437974c6732d8 100644
(file)
--- a/
include/wx/motif/cursor.h
+++ b/
include/wx/motif/cursor.h
@@
-12,44
+12,48
@@
#ifndef _WX_CURSOR_H_
#define _WX_CURSOR_H_
#ifndef _WX_CURSOR_H_
#define _WX_CURSOR_H_
-#include "wx/
object
.h"
+#include "wx/
gdiobj
.h"
#include "wx/gdicmn.h"
#include "wx/gdicmn.h"
-class WXDLL
EXPORT
wxImage;
+class WXDLL
IMPEXP_FWD_CORE
wxImage;
// Cursor
// Cursor
-class WXDLL
EXPORT wxCursor: public wx
Object
+class WXDLL
IMPEXP_CORE wxCursor : public wxGDI
Object
{
{
- DECLARE_DYNAMIC_CLASS(wxCursor)
-
public:
wxCursor();
wxCursor(const char bits[], int width, int height,
int hotSpotX = -1, int hotSpotY = -1,
public:
wxCursor();
wxCursor(const char bits[], int width, int height,
int hotSpotX = -1, int hotSpotY = -1,
- const char maskBits[] = NULL);
+ const char maskBits[] = NULL,
+ const wxColour* fg = NULL, const wxColour* bg = NULL);
- wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM,
- int hotSpotX = 0, int hotSpotY = 0);
+ wxCursor(const wxString& name,
+ wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
+ int hotSpotX = 0, int hotSpotY = 0);
#if wxUSE_IMAGE
wxCursor(const wxImage& image);
#endif
#if wxUSE_IMAGE
wxCursor(const wxImage& image);
#endif
- wxCursor(wxStockCursor id)
;
- ~wxCursor();
-
- virtual bool Ok() const;
+ wxCursor(wxStockCursor id)
{ InitFromStock(id); }
+#if WXWIN_COMPATIBILITY_2_8
+ wxCursor(int id) { InitFromStock((wxStockCursor)id); }
+#endif
- bool operator == (const wxCursor& cursor) const
- { return m_refData == cursor.m_refData; }
- bool operator != (const wxCursor& cursor) const
- { return m_refData != cursor.m_refData; }
+ virtual ~wxCursor();
// Motif-specific.
// Create/get a cursor for the current display
WXCursor GetXCursor(WXDisplay* display) 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:
private:
+ void InitFromStock(wxStockCursor);
+
void Create(const char bits[], int width, int height,
int hotSpotX = -1, int hotSpotY = -1,
const char maskBits[] = NULL);
void Create(const char bits[], int width, int height,
int hotSpotX = -1, int hotSpotY = -1,
const char maskBits[] = NULL);
@@
-57,9
+61,11
@@
private:
// Make a cursor from standard id
WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;
// Make a cursor from standard id
WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;
+
+ DECLARE_DYNAMIC_CLASS(wxCursor)
};
};
-extern WXDLL
EXPORT
void wxSetCursor(const wxCursor& cursor);
+extern WXDLL
IMPEXP_CORE
void wxSetCursor(const wxCursor& cursor);
#endif
// _WX_CURSOR_H_
#endif
// _WX_CURSOR_H_