X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f97c985452b20a8c2f0bbfb1d0275298bf09fb45..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/motif/app.cpp?ds=sidebyside diff --git a/src/motif/app.cpp b/src/motif/app.cpp index df82c80919..4216c8796e 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -1,267 +1,320 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/motif/app.cpp // Purpose: wxApp // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "app.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#include "wx/frame.h" #include "wx/app.h" -#include "wx/utils.h" -#include "wx/gdicmn.h" -#include "wx/pen.h" -#include "wx/brush.h" -#include "wx/cursor.h" -#include "wx/icon.h" -#include "wx/palette.h" -#include "wx/dc.h" -#include "wx/dialog.h" -#include "wx/msgdlg.h" -#include "wx/log.h" -#include "wx/module.h" -#include "wx/memory.h" - -#if wxUSE_WX_RESOURCES -#include "wx/resource.h" + +#ifndef WX_PRECOMP + #include "wx/hash.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/memory.h" + #include "wx/font.h" #endif -#if wxUSE_POSTSCRIPT -#include "wx/postscrp.h" +#include "wx/evtloop.h" + +#if wxUSE_THREADS + #include "wx/thread.h" #endif +#ifdef __VMS__ + #pragma message disable nosimpint +#endif #include #include #include #include #include +#ifdef __VMS__ + #pragma message enable nosimpint +#endif #include "wx/motif/private.h" #include -extern char *wxBuffer; -extern wxList wxPendingDelete; +struct wxPerDisplayData +{ + wxPerDisplayData() + { + m_visualInfo = NULL; + m_topLevelWidget = NULL; + m_topLevelRealizedWidget = NULL; + } -wxApp *wxTheApp = NULL; + wxXVisualInfo* m_visualInfo; + Widget m_topLevelWidget, m_topLevelRealizedWidget; +}; + +static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData, + XtPointer ptr); +static WXWidget wxCreateTopLevelWidget( WXDisplay* display ); + +extern bool wxAddIdleCallback(); wxHashTable *wxWidgetHashTable = NULL; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() -#endif - -long wxApp::sm_lastMessageTime = 0; -bool wxApp::Initialize() +extern "C" { -#ifdef __WXMSW__ - wxBuffer = new char[1500]; -#else - wxBuffer = new char[BUFSIZ + 512]; -#endif - -#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *); +} - streambuf* sBuf = new wxDebugStreamBuf; - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); +XErrorHandlerFunc gs_pfnXErrorHandler = 0; -#endif - - wxClassInfo::InitializeClasses(); +extern "C" +{ - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); - wxInitializeStockObjects(); +static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) +{ + // just forward to the default handler for now + return gs_pfnXErrorHandler(dpy, xevent); +} -#if wxUSE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif +} - // For PostScript printing -#if wxUSE_POSTSCRIPT - wxInitializePrintSetupData(); - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); +bool wxApp::Initialize(int& argc_, wxChar **argv_) +{ +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif - wxBitmap::InitStandardHandlers(); + if ( !wxAppBase::Initialize(argc_, argv_) ) + return false; wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); - wxModule::RegisterModules(); - wxASSERT( wxModule::InitializeModules() == TRUE ); +#ifdef __HPUX__ + // under HP-UX creating XmFontSet fails when the system locale is C and + // we're using a remote DISPLAY, presumably because HP-UX uses its own + // names for C and ISO locales (roman8 and iso8859n respectively) and so + // its Motif libraries have troubles with non-HP X server + // + // whatever the reason, the fact is that without this hack any wxMotif + // program crashes on startup because it can't create any font (HP programs + // still work but they do spit out messages about failing to create font + // sets and failing back on "fixed" font too) + // + // notice that calling setlocale() here is not enough because X(m) init + // functions call setlocale() later so we really have to change environment + bool fixAll = false; // tweak LC_ALL (or just LC_CTYPE)? + const char *loc = getenv("LC_CTYPE"); + if ( !loc ) + { + loc = getenv("LC_ALL"); + if ( loc ) + fixAll = true; + } - return TRUE; -} + if ( !loc || + (loc[0] == 'C' && loc[1] == '\0') || + strcmp(loc, "POSIX") == 0 ) + { + // we're using C locale, "fix" it + wxLogDebug(wxT("HP-UX fontset hack: forcing locale to en_US.iso88591")); + putenv(fixAll ? "LC_ALL=en_US.iso88591" : "LC_CTYPE=en_US.iso88591"); + } +#endif // __HPUX__ -void wxApp::CleanUp() -{ - delete wxWidgetHashTable; - wxWidgetHashTable = NULL; + XtSetLanguageProc(NULL, NULL, NULL); + XtToolkitInitialize() ; + wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext(); + + 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__ + wxMOTIF_STR("*sgiMode: True"), + wxMOTIF_STR("*useSchemes: all"), +#else // !__SGI__ +#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 + }; + XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources); + + // 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 = wxT("wxapp"); + wxString clsname = wxTheApp->GetClassName(); + if ( clsname.empty() ) + clsname = wxT("wx"); + + // FIXME-UTF8: This code is taken from wxGTK and duplicated here. This + // is just a temporary fix to make wxX11 compile in Unicode + // build, the real fix is to change Initialize()'s signature + // to use char* on Unix. +#if wxUSE_UNICODE + // XtOpenDisplay() wants char*, not wchar_t*, so convert + int i; + char **argvX11 = new char *[argc + 1]; + for ( i = 0; i < argc; i++ ) + { + argvX11[i] = strdup(wxConvLibc.cWX2MB(argv_[i])); + } - wxModule::CleanUpModules(); + argvX11[argc] = NULL; -#if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); -#endif + int argcX11 = argc; - wxDeleteStockObjects() ; + Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext, + (String)NULL, + appname.c_str(), + clsname.c_str(), + NULL, 0, // no options +# if XtSpecificationRelease < 5 + (Cardinal*) &argcX11, +# else + &argcX11, +# endif + argvX11); - // Destroy all GDI lists, etc. + if ( argcX11 != argc ) + { + // we have to drop the parameters which were consumed by X11+ + for ( i = 0; i < argcX11; i++ ) + { + while ( strcmp(wxConvLibc.cWX2MB(argv_[i]), argvX11[i]) != 0 ) + { + memmove(argv_ + i, argv_ + i + 1, (argc - i)*sizeof(*argv_)); + } + } - delete wxTheBrushList; - wxTheBrushList = NULL; + argc = argcX11; - delete wxThePenList; - wxThePenList = NULL; + // update internal arg[cv] as X11 may have removed processed options: + argc = argc_; + argv = argv_; + } + //else: XtOpenDisplay() didn't modify our parameters - delete wxTheFontList; - wxTheFontList = NULL; + // free our copy + for ( i = 0; i < argcX11; i++ ) + { + free(argvX11[i]); + } - delete wxTheBitmapList; - wxTheBitmapList = NULL; + delete [] argvX11; - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; +#else // ANSI -#if wxUSE_POSTSCRIPT - wxInitializePrintSetupData(FALSE); - delete wxThePrintPaperDatabase; - wxThePrintPaperDatabase = NULL; -#endif + 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 + &argc, +# endif + argv); - wxBitmap::CleanUpHandlers(); +#endif // Unicode/ANSI - delete[] wxBuffer; - wxBuffer = NULL; + if (!dpy) { + // if you don't log to stderr, nothing will be shown... + delete wxLog::SetActiveTarget(new wxLogStderr); + wxString className(wxTheApp->GetClassName()); + wxLogError(_("wxWidgets could not open display for '%s': exiting."), + className.c_str()); + exit(-1); + } + m_initialDisplay = (WXDisplay*) dpy; - wxClassInfo::CleanUpClasses(); + // install the X error handler + gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler); - // do it as the very last thing because everything else can log messages - wxLog::DontCreateOnDemand(); - // do it as the very last thing because everything else can log messages - delete wxLog::SetActiveTarget(NULL); -} + // Add general resize proc + XtActionsRec rec; + rec.string = wxMOTIF_STR("resize"); + rec.proc = (XtActionProc)wxWidgetResizeProc; + XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1); -int wxEntry( int argc, char *argv[] ) -{ - if (!wxApp::Initialize()) - return FALSE; - if (!wxTheApp) - { - if (!wxApp::GetInitializerFunction()) - { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; - }; - - wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) (); - }; - - if (!wxTheApp) - { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; - }; + GetMainColormap(dpy); - wxTheApp->SetClassName(wxFileNameFromPath(argv[0])); - wxTheApp->SetAppName(wxFileNameFromPath(argv[0])); + wxAddIdleCallback(); - wxTheApp->argc = argc; - wxTheApp->argv = argv; + return true; +} - // GUI-specific initialization, such as creating an app context. - wxTheApp->OnInitGui(); +void wxApp::CleanUp() +{ + wxAppBase::CleanUp(); - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). - - if (!wxTheApp->OnInit()) return 0; + wxDELETE(wxWidgetHashTable); - int retValue = 0; - - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); + delete m_mainLoop; - if (wxTheApp->GetTopWindow()) + for( wxPerDisplayDataMap::iterator it = m_perDisplayData->begin(), + end = m_perDisplayData->end(); + it != end; ++it ) { - delete wxTheApp->GetTopWindow(); - wxTheApp->SetTopWindow(NULL); + delete it->second->m_visualInfo; + // On Solaris 10 calling XtDestroyWidget on the top level widget + // dumps core if the locale is set to something other than "C" +#ifndef __SUN__ + XtDestroyWidget( it->second->m_topLevelWidget ); +#endif + delete it->second; } - - wxTheApp->DeletePendingObjects(); - - wxTheApp->OnExit(); - +} + +void wxApp::Exit() +{ wxApp::CleanUp(); - delete wxTheApp; - wxTheApp = NULL; - -#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // At this point we want to check if there are any memory - // blocks that aren't part of the wxDebugContext itself, - // as a special case. Then when dumping we need to ignore - // wxDebugContext, too. - if (wxDebugContext::CountObjectsLeft() > 0) - { - wxTrace("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } - wxDebugContext::SetStream(NULL, NULL); -#endif - - return retValue; -}; + wxAppConsole::Exit(); +} -// Static member initialization -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +// ============================================================================ +// wxApp +// ============================================================================ wxApp::wxApp() { - m_topWindow = NULL; - wxTheApp = this; - m_className = ""; - m_wantDebugOutput = TRUE ; - m_appName = ""; - argc = 0; - argv = NULL; - m_printMode = wxPRINT_POSTSCRIPT; - m_exitOnFrameDelete = TRUE; - m_auto3D = TRUE; - + m_mainLoop = new wxEventLoop; m_mainColormap = (WXColormap) NULL; m_appContext = (WXAppContext) NULL; - m_topLevelWidget = (WXWidget) NULL; - m_maxRequestSize = 0; + m_initialDisplay = (WXDisplay*) 0; + m_perDisplayData = new wxPerDisplayDataMap; } -bool wxApp::Initialized() +wxApp::~wxApp() { - if (GetTopWindow()) - return TRUE; - else - return FALSE; + delete m_perDisplayData; } int wxApp::MainLoop() { - m_keepGoing = TRUE; - - /* + /* * Sit around forever waiting to process X-events. Property Change * event are handled special, because they have to refer to * the root window rather than to a widget. therefore we can't @@ -269,73 +322,14 @@ int wxApp::MainLoop() */ XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()), - XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())), - PropertyChangeMask); - - XEvent event; - - // Use this flag to allow breaking the loop via wxApp::ExitMainLoop() - while (m_keepGoing) - { - XtAppNextEvent( (XtAppContext) wxTheApp->GetAppContext(), &event); - if(event.type == PropertyNotify) - { - HandlePropertyChange((WXEvent*) &event); - } else - { - // Terry Gitnick - 1/21/98 - /* if resize event, don't resize until the last resize event for this - window is recieved. Prevents flicker as windows are resized. */ - if (event.type == ResizeRequest) - { - Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget()); - Window win = event.xany.window; - XEvent report; - - // to avoid flicker - report = event; - while( XCheckTypedWindowEvent (disp, win, ResizeRequest, &report)); - } - // TODO: when implementing refresh optimization, we can use - // XtAddExposureToRegion to expand the window's paint region. - - XtDispatchEvent(&event); + XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())), + PropertyChangeMask); - DeletePendingObjects(); - } - } + m_mainLoop->Run(); return 0; } -// Returns TRUE if more time is needed. -bool wxApp::ProcessIdle() -{ - wxIdleEvent event; - event.SetEventObject(this); - ProcessEvent(event); - - return event.MoreRequested(); -} - -void wxApp::ExitMainLoop() -{ - m_keepGoing = FALSE; -} - -// Is a message/event pending? -bool wxApp::Pending() -{ - XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() )); - return (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) != 0) ; -} - -// Dispatch a message. -void wxApp::Dispatch() -{ - XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll); -} - // This should be redefined in a derived class for // handling property change events for XAtom IPC. void wxApp::HandlePropertyChange(WXEvent *event) @@ -344,172 +338,137 @@ void wxApp::HandlePropertyChange(WXEvent *event) XtDispatchEvent((XEvent*) event); /* let Motif do the work */ } -void wxApp::OnIdle(wxIdleEvent& event) +WXColormap wxApp::GetMainColormap(WXDisplay* display) { - static bool inOnIdle = FALSE; - - // Avoid recursion (via ProcessEvent default case) - if (inOnIdle) - return; - - inOnIdle = TRUE; - - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); + if (!display) /* Must be called first with non-NULL display */ + return m_mainColormap; - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->HasPendingMessages() ) - pLog->Flush(); + int defaultScreen = DefaultScreen((Display*) display); + Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen); - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); + Colormap c = DefaultColormapOfScreen(screen); - if (needMore) - event.RequestMore(TRUE); + if (!m_mainColormap) + m_mainColormap = (WXColormap) c; - inOnIdle = FALSE; + return (WXColormap) c; } -// Send idle event to all top-level windows -bool wxApp::SendIdleEvents() +static inline wxPerDisplayData& GetOrCreatePerDisplayData + ( wxPerDisplayDataMap& m, WXDisplay* display ) { - bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->Next(); - } - return needMore; + wxPerDisplayDataMap::iterator it = m.find( display ); + if( it != m.end() && it->second != NULL ) + return *(it->second); + + wxPerDisplayData* nData = new wxPerDisplayData(); + m[display] = nData; + + return *nData; } -// Send idle event to window and all subwindows -bool wxApp::SendIdleEvents(wxWindow* win) +wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display ) { - bool needMore = FALSE; - - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); + wxPerDisplayData& data = GetOrCreatePerDisplayData( *m_perDisplayData, + display ); + if( data.m_visualInfo ) + return data.m_visualInfo; - if (event.MoreRequested()) - needMore = TRUE; + wxXVisualInfo* vi = new wxXVisualInfo; + wxFillXVisualInfo( vi, (Display*)display ); - wxNode* node = win->GetChildren()->First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; + data.m_visualInfo = vi; - node = node->Next(); - } - return needMore ; + return vi; } -void wxApp::DeletePendingObjects() +static void wxTLWidgetDestroyCallback(Widget w, XtPointer WXUNUSED(clientData), + XtPointer WXUNUSED(ptr)) { - wxNode *node = wxPendingDelete.First(); - while (node) + if( wxTheApp ) { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; - - if (wxPendingDelete.Member(obj)) - delete node; - - // Deleting one object may have deleted other pending - // objects, so start from beginning of list again. - node = wxPendingDelete.First(); + wxTheApp->SetTopLevelWidget( (WXDisplay*)XtDisplay(w), + (WXWidget)NULL ); + wxTheApp->SetTopLevelRealizedWidget( (WXDisplay*)XtDisplay(w), + (WXWidget)NULL ); } } -wxLog* wxApp::CreateLogTarget() +WXWidget wxCreateTopLevelWidget( WXDisplay* display ) { - return new wxLogGui; + Widget tlw = XtAppCreateShell( (String)NULL, + wxTheApp->GetClassName().c_str(), + applicationShellWidgetClass, + (Display*)display, + NULL, 0 ); + XtVaSetValues( tlw, + XmNoverrideRedirect, True, + NULL ); + + XtAddCallback( tlw, XmNdestroyCallback, + (XtCallbackProc)wxTLWidgetDestroyCallback, + (XtPointer)NULL ); + + return (WXWidget)tlw; } -wxWindow* wxApp::GetTopWindow() const +WXWidget wxCreateTopLevelRealizedWidget( WXDisplay* WXUNUSED(display) ) { - if (m_topWindow) - return m_topWindow; - else if (wxTopLevelWindows.Number() > 0) - return (wxWindow*) wxTopLevelWindows.First()->Data(); - else - return NULL; + Widget rTlw = XtVaCreateWidget( "dummy_widget", topLevelShellWidgetClass, + (Widget)wxTheApp->GetTopLevelWidget(), + NULL ); + XtSetMappedWhenManaged( rTlw, False ); + XtRealizeWidget( rTlw ); + + return (WXWidget)rTlw; } -// Create an application context -bool wxApp::OnInitGui() +WXWidget wxApp::GetTopLevelWidget() { - XtToolkitInitialize() ; - wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ; - Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL, - (const char*) wxTheApp->GetClassName(), NULL, -# if XtSpecificationRelease < 5 - 0,(Cardinal*) &argc,argv) ; -# else - 0,&argc,argv) ; -# endif - if (!dpy) { - cerr << "wxWindows could not open display for " << wxTheApp->GetClassName() << ": exiting.\n"; - exit(-1); - } - wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(), - applicationShellWidgetClass,dpy, - NULL,0) ; + WXDisplay* display = wxGetDisplay(); + wxPerDisplayData& data = GetOrCreatePerDisplayData( *m_perDisplayData, + display ); + if( data.m_topLevelWidget ) + return (WXWidget)data.m_topLevelWidget; - // Add general resize proc - XtActionsRec rec; - rec.string = "resize"; - rec.proc = (XtActionProc)wxWidgetResizeProc; - XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1); - - GetMainColormap(dpy); - m_maxRequestSize = XMaxRequestSize((Display*) dpy); + WXWidget tlw = wxCreateTopLevelWidget( display ); + SetTopLevelWidget( display, tlw ); - return TRUE; + return tlw; } -WXColormap wxApp::GetMainColormap(WXDisplay* display) +WXWidget wxApp::GetTopLevelRealizedWidget() { - if (!display) /* Must be called first with non-NULL display */ - return m_mainColormap; + WXDisplay* display = wxGetDisplay(); + wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display ); - Colormap c = - DefaultColormapOfScreen(XScreenOfDisplay((Display*) display, - DefaultScreen((Display*) display))); + if( it != m_perDisplayData->end() && it->second->m_topLevelRealizedWidget ) + return (WXWidget)it->second->m_topLevelRealizedWidget; - if (!m_mainColormap) - m_mainColormap = (WXColormap) c; + WXWidget rTlw = wxCreateTopLevelRealizedWidget( display ); + SetTopLevelRealizedWidget( display, rTlw ); - return (WXColormap) c; + return rTlw; } -void wxExit() +void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget) { - int retValue = 0; - if (wxTheApp) - retValue = wxTheApp->OnExit(); - - wxApp::CleanUp(); - /* - * Exit in some platform-specific way. Not recommended that the app calls this: - * only for emergencies. - */ - exit(retValue); + GetOrCreatePerDisplayData( *m_perDisplayData, display ) + .m_topLevelWidget = (Widget)widget; } -// Yield to other processes -bool wxYield() +void wxApp::SetTopLevelRealizedWidget(WXDisplay* display, WXWidget widget) { - while (wxTheApp && wxTheApp->Pending()) - wxTheApp->Dispatch(); - return TRUE; + GetOrCreatePerDisplayData( *m_perDisplayData, display ) + .m_topLevelRealizedWidget = (Widget)widget; } + +// ---------------------------------------------------------------------------- +// accessors for C modules +// ---------------------------------------------------------------------------- + +extern "C" XtAppContext wxGetAppContext() +{ + return (XtAppContext)wxTheApp->GetAppContext(); +}