projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better fix
[wxWidgets.git]
/
src
/
motif
/
cursor.cpp
diff --git
a/src/motif/cursor.cpp
b/src/motif/cursor.cpp
index 5548cac50555c9bf4527a5406218b82bdc1725a4..134c7e9596587eb37b63917f20450f148649d3ee 100644
(file)
--- a/
src/motif/cursor.cpp
+++ b/
src/motif/cursor.cpp
@@
-12,13
+12,17
@@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+ #include "wx/list.h"
+#endif
+
#include "wx/cursor.h"
#include "wx/cursor.h"
-#include "wx/app.h"
-#i
nclude "wx/utils.h"
-
#include "wx/list
.h"
-
#include "wx/window
.h"
-#if wxUSE_IMAGE
-#include "wx/image.h"
+
+#i
fndef WX_PRECOMP
+
#include "wx/app
.h"
+
#include "wx/utils
.h"
+ #include "wx/window.h"
+
#include "wx/image.h"
#endif
#ifdef __VMS__
#endif
#ifdef __VMS__
@@
-45,15
+49,16
@@
WX_DECLARE_LIST(wxXCursor, wxXCursorList);
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxXCursorList)
#include "wx/listimpl.cpp"
WX_DEFINE_LIST(wxXCursorList)
-class WXDLLEXPORT wxCursorRefData: public wx
Object
RefData
+class WXDLLEXPORT wxCursorRefData: public wx
GDI
RefData
{
{
- friend class WXDLLEXPORT wxCursor;
public:
wxCursorRefData();
public:
wxCursorRefData();
- ~wxCursorRefData();
+
virtual
~wxCursorRefData();
wxXCursorList m_cursors; // wxXCursor objects, one per display
wxStockCursor m_cursorId; // wxWidgets standard cursor id
wxXCursorList m_cursors; // wxXCursor objects, one per display
wxStockCursor m_cursorId; // wxWidgets standard cursor id
+
+ friend class wxCursor;
};
#define M_CURSORDATA ((wxCursorRefData *)m_refData)
};
#define M_CURSORDATA ((wxCursorRefData *)m_refData)
@@
-255,7
+260,7
@@
wxCursor::wxCursor(const wxString& name, long flags, int hotSpotX, int hotSpotY)
int screen_num = DefaultScreen (dpy);
int value = XReadBitmapFile (dpy, RootWindow (dpy, screen_num),
int screen_num = DefaultScreen (dpy);
int value = XReadBitmapFile (dpy, RootWindow (dpy, screen_num),
-
wxConstCast(name.c_str(), char
),
+
name.mb_str(
),
&w, &h, &pixmap, &hotX, &hotY);
if (value == BitmapSuccess)
&w, &h, &pixmap, &hotX, &hotY);
if (value == BitmapSuccess)
@@
-289,9
+294,14
@@
wxCursor::~wxCursor()
{
}
{
}
-bool wxCursor::Ok() const
+wxGDIRefData *wxCursor::CreateGDIRefData() const
+{
+ return new wxCursorRefData;
+}
+
+wxGDIRefData *wxCursor::CloneGDIRefData(const wxGDIRefData *data) const
{
{
- return
m_refData != NULL
;
+ return
new wxCursorRefData(*wx_static_cast(const wxCursorRefData *, data))
;
}
// Motif-specific: create/get a cursor for the current display
}
// Motif-specific: create/get a cursor for the current display