Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation without threads fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-03-16 13:46:56 +00:00
parent 6442ad7f48
commit 9c6e1335a0
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/motif/app.cpp
View File

@@ -29,12 +29,10 @@
#include "wx/module.h" #include "wx/module.h"
#include "wx/memory.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 #endif
#include <Xm/Xm.h> #include <Xm/Xm.h>
@@ -56,8 +54,9 @@ wxHashTable *wxWidgetHashTable = NULL;
#if !USE_SHARED_LIBRARY #if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) 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() END_EVENT_TABLE()
#endif #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() ; XtToolkitInitialize() ;
wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ; wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL, 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); exit(-1);
} }
m_initialDisplay = (WXDisplay*) dpy; m_initialDisplay = (WXDisplay*) dpy;