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/utils.cpp
+++ b/src/motif/utils.cpp
@@ -290,7 +290,12 @@ WXDisplay *wxGetDisplay()
  if (gs_currentDisplay)
    return gs_currentDisplay;

-  return XtDisplay ((Widget) wxTheApp->GetTopLevelWidget());
+  if (wxTheApp && wxTheApp->GetTopLevelWidget())
+    return XtDisplay ((Widget) wxTheApp->GetTopLevelWidget());
+  else if (wxTheApp)
+    return wxTheApp->GetInitialDisplay();
+  else
+    return (WXDisplay*) NULL;
 }

 bool wxSetDisplay(const wxString& display_name)