projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes to WXDLLEXPORT keyword position for VC++ 6.0; changed
[wxWidgets.git]
/
src
/
motif
/
cursor.cpp
diff --git
a/src/motif/cursor.cpp
b/src/motif/cursor.cpp
index 24c94be559871dd43c2d9bc53262307d50e05ffd..c1027a775e0049a38b2baaaea17804b46f26cde5 100644
(file)
--- a/
src/motif/cursor.cpp
+++ b/
src/motif/cursor.cpp
@@
-188,8
+188,13
@@
wxCursor::wxCursor(wxStockCursor id)
{
m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursorId = id;
{
m_refData = new wxCursorRefData;
M_CURSORDATA->m_cursorId = id;
+ M_CURSORDATA->m_ok = TRUE;
- WXCursor cursor = GetXCursor(wxGetDisplay());
+ WXDisplay* display = wxGetDisplay();
+ if (!display)
+ return;
+
+ WXCursor cursor = GetXCursor(display);
if (cursor)
{
wxXCursor* c = new wxXCursor;
if (cursor)
{
wxXCursor* c = new wxXCursor;
@@
-423,7
+428,7
@@
WXCursor wxCursor::MakeCursor(WXDisplay* display, wxStockCursor id)
}
// Global cursor setting
}
// Global cursor setting
-void wxSetCursor(const wxCursor&
cursor
)
+void wxSetCursor(const wxCursor&
WXUNUSED(cursor)
)
{
// Nothing to do for Motif (no global cursor)
}
{
// Nothing to do for Motif (no global cursor)
}