projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use memcpy() instead of wxTmemcpy() as the latter is defined in wx/wxcrt.h which...
[wxWidgets.git]
/
include
/
wx
/
motif
/
cursor.h
diff --git
a/include/wx/motif/cursor.h
b/include/wx/motif/cursor.h
index 87a19dadc987d97b89d35fbb9b6bde74dccffd6b..9372b60e2b049bdc973849c0859cf311638b685d 100644
(file)
--- a/
include/wx/motif/cursor.h
+++ b/
include/wx/motif/cursor.h
@@
-1,68
+1,63
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: cursor.h
+// Name:
wx/motif/
cursor.h
// Purpose: wxCursor class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Purpose: wxCursor class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CURSOR_H_
#define _WX_CURSOR_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CURSOR_H_
#define _WX_CURSOR_H_
-#ifdef __GNUG__
-#pragma interface "cursor.h"
-#endif
-
-#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();
public:
wxCursor();
-
- // Copy constructors
- wxCursor(const wxCursor& cursor) { Ref(cursor); }
-
- wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
- const char maskBits[] = NULL);
-
+
+ wxCursor(const char bits[], int width, int height,
+ int hotSpotX = -1, int hotSpotY = -1,
+ const char maskBits[] = NULL);
+
wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM,
int hotSpotX = 0, int hotSpotY = 0);
wxCursor(const wxString& name, long flags = wxBITMAP_TYPE_XBM,
int hotSpotX = 0, int hotSpotY = 0);
-#if wxUSE_IMAGE
+#if wxUSE_IMAGE
wxCursor(const wxImage& image);
#endif
wxCursor(const wxImage& image);
#endif
-
+
wxCursor(wxStockCursor id);
wxCursor(wxStockCursor id);
- ~wxCursor();
-
- virtual bool Ok() const;
-
- wxCursor& operator = (const wxCursor& cursor)
- { if (*this == cursor) return (*this); Ref(cursor); return *this; }
- 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
// Motif-specific.
// Create/get a cursor for the current display
- WXCursor GetXCursor(WXDisplay* display) ;
+ WXCursor GetXCursor(WXDisplay* display) const;
+
+protected:
+ virtual wxGDIRefData *CreateGDIRefData() const;
+ virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
private:
private:
+ void Create(const char bits[], int width, int height,
+ int hotSpotX = -1, int hotSpotY = -1,
+ const char maskBits[] = NULL);
+ void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY);
+
// Make a cursor from standard id
// Make a cursor from standard id
- WXCursor MakeCursor(WXDisplay* display, wxStockCursor 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_