Misc. Motif; removed duplicate wxICON; variant compile fix; added wxString form

of wxStripMenuCodes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-16 14:38:52 +00:00
parent 85ee3474b7
commit 47bc106012
18 changed files with 770 additions and 79 deletions
--- 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_CURSORDATA->m_ok = TRUE;

-    WXCursor cursor = GetXCursor(wxGetDisplay());
+    WXDisplay* display = wxGetDisplay();
+    if (!display)
+      return;
+
+    WXCursor cursor = GetXCursor(display);
    if (cursor)
    {
        wxXCursor* c = new wxXCursor;