fix wxStringOutputStream::Write() in Unicode build when the output overlaps a boundar...

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 8e4db93daa596f1f0285f0784ec84d8e9a76fa22..e36d19b6e6f2873f01de6bb3e70a2e6c0be642a8 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -25,9 +25,9 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/memory.h"
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/memory.h"

+    #include "wx/font.h"

 #endif
 
 #endif
 

-#include "wx/module.h"

 #include "wx/evtloop.h"
 
 #if wxUSE_THREADS
 #include "wx/evtloop.h"
 
 #if wxUSE_THREADS


@@ -35,7 +35,7 @@
 #endif
 
 #ifdef __VMS__
 #endif
 
 #ifdef __VMS__

-#pragma message disable nosimpint
+    #pragma message disable nosimpint

 #endif
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #endif
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>


@@ -43,7 +43,7 @@
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>
 #ifdef __VMS__
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>
 #ifdef __VMS__

-#pragma message enable nosimpint
+    #pragma message enable nosimpint

 #endif
 
 #include "wx/motif/private.h"
 #endif
 
 #include "wx/motif/private.h"


@@ -99,15 +99,15 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
 
 bool wxApp::Initialize(int& argcOrig, wxChar **argvOrig)
 {
 
 bool wxApp::Initialize(int& argcOrig, wxChar **argvOrig)
 {

+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
+

     if ( !wxAppBase::Initialize(argcOrig, argvOrig) )
         return false;
 
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
 
     if ( !wxAppBase::Initialize(argcOrig, argvOrig) )
         return false;
 
     wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
 

-#if wxUSE_INTL
-    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
-#endif
-

     return true;
 }
 
     return true;
 }
 


@@ -132,8 +132,6 @@ void wxApp::CleanUp()
 #endif
         delete it->second;
     }
 #endif
         delete it->second;
     }

-
-    delete m_perDisplayData;

 }
 
 void wxApp::Exit()
 }
 
 void wxApp::Exit()


@@ -161,7 +159,7 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
 
 wxApp::~wxApp()
 {

-    wxApp::SetInstance(NULL);
+    delete m_perDisplayData;

 }
 
 int wxApp::MainLoop()
 }
 
 int wxApp::MainLoop()


@@ -199,10 +197,17 @@ static char *fallbackResources[] = {
     wxMOTIF_STR("*sgiMode: True"),
     wxMOTIF_STR("*useSchemes: all"),
 #else // !__SGI__
     wxMOTIF_STR("*sgiMode: True"),
     wxMOTIF_STR("*useSchemes: all"),
 #else // !__SGI__

-    wxMOTIF_STR("*menuBar.marginHeight: 0"),
-    wxMOTIF_STR("*menuBar.shadowThickness: 1"),
-    wxMOTIF_STR("*background: #c0c0c0"),
-    wxMOTIF_STR("*foreground: black"),
+#if !wxMOTIF_USE_RENDER_TABLE
+    wxMOTIF_STR("*.fontList: -*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"),
+#else
+    wxMOTIF_STR("*wxDefaultRendition.fontName: -*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"),
+    wxMOTIF_STR("*wxDefaultRendition.fontType: FONT_IS_FONTSET"),
+    wxMOTIF_STR("*.renderTable: wxDefaultRendition"),
+#endif
+    wxMOTIF_STR("*listBox.background: white"),
+    wxMOTIF_STR("*text.background: white"),
+    wxMOTIF_STR("*comboBox.Text.background: white"),
+    wxMOTIF_STR("*comboBox.List.background: white"),

 #endif // __SGI__/!__SGI__
     NULL
 };
 #endif // __SGI__/!__SGI__
     NULL
 };