From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 19 Dec 2005 16:06:31 +0000 (+0000)
Subject: don't crash when XIM is used under IRIX
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0b6d76bfd477722d73589b20a15d05b8b570bd61?ds=inline

don't crash when XIM is used under IRIX


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 1b899d82ca..90e6fc94b9 100644
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -247,8 +247,20 @@ bool wxApp::OnInitGui()
     wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext();
     XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources);
 
-    Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
-        wxTheApp->GetClassName().c_str(), NULL, 0,
+    // we shouldn't pass empty application/class name as it results in
+    // immediate crash inside XOpenIM() (if XIM is used) under IRIX
+    wxString appname = wxTheApp->GetAppName();
+    if ( appname.empty() )
+        appname = _T("wxapp");
+    wxString clsname = wxTheApp->GetClassName();
+    if ( clsname.empty() )
+        clsname = _T("wx");
+
+    Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,
+        (String)NULL,
+        appname.c_str(),
+        clsname.c_str(),
+        NULL, 0,    // no options
 # if XtSpecificationRelease < 5
         (Cardinal*) &argc,
 # else