compilation without threads fixed

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 97e2911eb03d0b964c5366f9330fed7b3a411cd4..c8b0dff7042fbbadcdae01751589e7caaec6c599 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -29,12 +29,10 @@
 #include "wx/module.h"
 #include "wx/memory.h"
 
 #include "wx/module.h"
 #include "wx/memory.h"
 

-#if wxUSE_THREADS

 #include "wx/thread.h"
 #include "wx/thread.h"

-#endif

 
 #if wxUSE_WX_RESOURCES
 
 #if wxUSE_WX_RESOURCES

-#include "wx/resource.h"
+    #include "wx/resource.h"

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


@@ -56,8 +54,9 @@ wxHashTable *wxWidgetHashTable = NULL;
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)

+

 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
 BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)

-EVT_IDLE(wxApp::OnIdle)
+    EVT_IDLE(wxApp::OnIdle)

 END_EVENT_TABLE()
 #endif
 
 END_EVENT_TABLE()
 #endif
 


@@ -65,11 +64,7 @@ long wxApp::sm_lastMessageTime = 0;
 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {

-#ifdef __WXMSW__
-    wxBuffer = new char[1500];
-#else

     wxBuffer = new char[BUFSIZ + 512];
     wxBuffer = new char[BUFSIZ + 512];

-#endif

 
     wxClassInfo::InitializeClasses();
 
 
     wxClassInfo::InitializeClasses();
 


@@ -505,14 +500,17 @@ bool wxApp::OnInitGui()
     XtToolkitInitialize() ;
     wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
     Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
     XtToolkitInitialize() ;
     wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
     Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,

-        (const char*) wxTheApp->GetClassName(), NULL,
+        (const char*) wxTheApp->GetClassName(), NULL, 0,

 # if XtSpecificationRelease < 5
 # if XtSpecificationRelease < 5

-        0,(Cardinal*) &argc,argv) ;
+        (Cardinal*) &argc,

 # else
 # else

-    0,&argc,argv) ;
+        &argc,

 # endif
 # endif

+        argv);
+

     if (!dpy) {
     if (!dpy) {

-        cerr << "wxWindows could not open display for " << wxTheApp->GetClassName() << ": exiting.\n";
+        wxLogError(_("wxWindows could not open display for '%s': exiting."),
+                   wxTheApp->GetClassName());

         exit(-1);
     }
     m_initialDisplay = (WXDisplay*) dpy;
         exit(-1);
     }
     m_initialDisplay = (WXDisplay*) dpy;