Applied [ 1235509 ] wxCocoa unicode wxT("fixes")

[wxWidgets.git] / src / motif / app.cpp

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index fa41cfebee8c0ce2d33f6d60cb7c34ba779081cb..3dbf47a9fd79a94bddc178ef01ceda168b775a29 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -97,6 +97,10 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
 
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
+
     return true;
 }
 
@@ -176,10 +180,19 @@ void wxApp::HandlePropertyChange(WXEvent *event)
 }
 
 static char *fallbackResources[] = {
+    // better defaults for CDE under Irix
+    //
+    // TODO: do something similar for the other systems, the hardcoded defaults
+    //       below are ugly
+#ifdef __SGI__
+    "*sgiMode: True",
+    "*useSchemes: all",
+#else // !__SGI__
     "*menuBar.marginHeight: 0",
     "*menuBar.shadowThickness: 1",
     "*background: #c0c0c0",
     "*foreground: black",
+#endif // __SGI__/!__SGI__
     NULL
 };
 
@@ -189,6 +202,7 @@ bool wxApp::OnInitGui()
     if( !wxAppBase::OnInitGui() )
         return false;
 
+    XtSetLanguageProc(NULL, NULL, NULL);
     XtToolkitInitialize() ;
     wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext();
     XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources);