X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfe835d075811cc32e8e1340e8c84bdcd014def2..fc32630a5e03e60a67d4ef53fc59985ea087b451:/src/motif/app.cpp diff --git a/src/motif/app.cpp b/src/motif/app.cpp index 4fd539d71c..5807769612 100644 --- a/src/motif/app.cpp +++ b/src/motif/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/motif/app.cpp // Purpose: wxApp // Author: Julian Smart // Modified by: @@ -9,42 +9,28 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "app.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/app.h" -#ifdef __VMS -#define XtParent XTPARENT -#define XtDisplay XTDISPLAY +#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 -#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" -#include "wx/log.h" -#include "wx/intl.h" #include "wx/evtloop.h" -#include "wx/hash.h" -#include "wx/hashmap.h" #if wxUSE_THREADS #include "wx/thread.h" #endif #ifdef __VMS__ -#pragma message disable nosimpint + #pragma message disable nosimpint #endif #include #include @@ -52,223 +38,283 @@ #include #include #ifdef __VMS__ -#pragma message enable nosimpint + #pragma message enable nosimpint #endif #include "wx/motif/private.h" #include -WX_DECLARE_VOIDPTR_HASH_MAP( wxXVisualInfo*, wxXVisualInfoMap ); +struct wxPerDisplayData +{ + wxPerDisplayData() + { + m_visualInfo = NULL; + m_topLevelWidget = NULL; + m_topLevelRealizedWidget = NULL; + } + + wxXVisualInfo* m_visualInfo; + Widget m_topLevelWidget, m_topLevelRealizedWidget; +}; + +static void wxTLWidgetDestroyCallback(Widget w, XtPointer clientData, + XtPointer ptr); +static WXWidget wxCreateTopLevelWidget( WXDisplay* display ); -extern wxList wxPendingDelete; extern bool wxAddIdleCallback(); -wxApp *wxTheApp = NULL; - wxHashTable *wxWidgetHashTable = NULL; IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() - #ifdef __WXDEBUG__ +extern "C" +{ typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *); +} - XErrorHandlerFunc gs_pfnXErrorHandler = 0; - - static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) - { - // just forward to the default handler for now - return gs_pfnXErrorHandler(dpy, xevent); - } -#endif // __WXDEBUG__ +XErrorHandlerFunc gs_pfnXErrorHandler = 0; -long wxApp::sm_lastMessageTime = 0; +extern "C" +{ -bool wxApp::Initialize() +static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent) { - wxClassInfo::InitializeClasses(); + // just forward to the default handler for now + return gs_pfnXErrorHandler(dpy, xevent); +} - // GL: I'm annoyed ... I don't know where to put this and I don't want to - // create a module for that as it's part of the core. -#if wxUSE_THREADS - wxPendingEventsLocker = new wxCriticalSection(); -#endif +} +#endif // __WXDEBUG__ - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); +bool wxApp::Initialize(int& argc_, wxChar **argv_) +{ +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif - wxInitializeStockLists(); - wxInitializeStockObjects(); + if ( !wxAppBase::Initialize(argc_, argv_) ) + return false; wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER); - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; +#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(_T("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(); - wxModule::CleanUpModules(); + 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); - wxDeleteStockObjects() ; + // 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 = _T("wxapp"); + wxString clsname = wxTheApp->GetClassName(); + if ( clsname.empty() ) + clsname = _T("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])); + } - // Destroy all GDI lists, etc. + argvX11[argc] = NULL; - wxDeleteStockLists(); + int argcX11 = argc; - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; + 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); - wxClassInfo::CleanUpClasses(); + 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 wxTheApp; - wxTheApp = NULL; + argc = argcX11; - // GL: I'm annoyed ... I don't know where to put this and I don't want to - // create a module for that as it's part of the core. -#if wxUSE_THREADS - delete wxPendingEvents; - delete wxPendingEventsLocker; -#endif + // update internal arg[cv] as X11 may have removed processed options: + argc = argc_; + argv = argv_; + } + //else: XtOpenDisplay() didn't modify our parameters -#if (defined(__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(TRUE) > 0) + // free our copy + for ( i = 0; i < argcX11; i++ ) { - wxLogDebug("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); + free(argvX11[i]); } -#endif - // 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); -} + delete [] argvX11; -int wxEntry( int argc, char *argv[] ) -{ -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // This seems to be necessary since there are 'rogue' - // objects present at this point (perhaps global objects?) - // Setting a checkpoint will ignore them as far as the - // memory checking facility is concerned. - // Of course you may argue that memory allocated in globals should be - // checked, but this is a reasonable compromise. - wxDebugContext::SetCheckpoint(); -#endif +#else // ANSI - if (!wxApp::Initialize()) - return FALSE; + 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); - if (!wxTheApp) - { - if (!wxApp::GetInitializerFunction()) - { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; - }; +#endif // Unicode/ANSI - wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) (); - }; + 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; - if (!wxTheApp) - { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; - }; +#ifdef __WXDEBUG__ + // install the X error handler + gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler); +#endif // __WXDEBUG__ - wxTheApp->SetClassName(wxFileNameFromPath(argv[0])); - wxTheApp->SetAppName(wxFileNameFromPath(argv[0])); + // Add general resize proc + XtActionsRec rec; + rec.string = wxMOTIF_STR("resize"); + rec.proc = (XtActionProc)wxWidgetResizeProc; + XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1); - wxTheApp->argc = argc; - wxTheApp->argv = argv; + GetMainColormap(dpy); - // GUI-specific initialization, such as creating an app context. - wxTheApp->OnInitGui(); + wxAddIdleCallback(); - // Here frames insert themselves automatically into wxTopLevelWindows by - // getting created in OnInit(). + return true; +} - int retValue = 0; - if (wxTheApp->OnInit()) - { - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); - } +void wxApp::CleanUp() +{ + wxAppBase::CleanUp(); - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->HasPendingMessages() ) - pLog->Flush(); + delete wxWidgetHashTable; + wxWidgetHashTable = NULL; - // So dialog boxes aren't used for further messages - delete wxLog::SetActiveTarget(new wxLogStderr); + 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(); - return retValue; -}; + wxAppConsole::Exit(); +} -// Static member initialization -wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; +// ============================================================================ +// wxApp +// ============================================================================ wxApp::wxApp() { - argc = 0; - argv = NULL; - - m_eventLoop = new wxEventLoop; + m_mainLoop = new wxEventLoop; m_mainColormap = (WXColormap) NULL; m_appContext = (WXAppContext) NULL; - m_topLevelWidget = (WXWidget) NULL; - m_maxRequestSize = 0; m_initialDisplay = (WXDisplay*) 0; - m_visualInfoMap = new wxXVisualInfoMap; + m_perDisplayData = new wxPerDisplayDataMap; } wxApp::~wxApp() { - delete m_eventLoop; - - for( wxXVisualInfoMap::iterator it = m_visualInfoMap->begin(), - end = m_visualInfoMap->end(); - it != end; ++it ) - { - delete it->second; - } - - delete m_visualInfoMap; -} - -bool wxApp::Initialized() -{ - if (GetTopWindow()) - return TRUE; - else - return FALSE; + delete m_perDisplayData; } int wxApp::MainLoop() @@ -284,48 +330,11 @@ int wxApp::MainLoop() XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())), PropertyChangeMask); - m_eventLoop->Run(); + m_mainLoop->Run(); return 0; } -// Processes an idle event. -// Returns TRUE if more time is needed. -bool wxApp::ProcessIdle() -{ - wxIdleEvent event; - - return ProcessEvent(event) && event.MoreRequested(); -} - -void wxApp::ExitMainLoop() -{ - m_eventLoop->Exit(); -} - -// Is a message/event pending? -bool wxApp::Pending() -{ -<<<<<<< app.cpp - return XtAppPending( (XtAppContext) GetAppContext() ) != 0; -======= - return m_eventLoop->Pending(); -#if 0 - XFlush(XtDisplay( (Widget) wxTheApp->GetTopLevelWidget() )); - - // Fix by Doug from STI, to prevent a stall if non-X event - // is found. - return ((XtAppPending( (XtAppContext) GetAppContext() ) & XtIMXEvent) != 0) ; -#endif ->>>>>>> 1.57 -} - -// Dispatch a message. -void wxApp::Dispatch() -{ - m_eventLoop->Dispatch(); -} - // This should be redefined in a derived class for // handling property change events for XAtom IPC. void wxApp::HandlePropertyChange(WXEvent *event) @@ -334,216 +343,136 @@ 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; - - // If there are pending events, we must process them: pending events - // are either events to the threads other than main or events posted - // with wxPostEvent() functions - // GRG: I have moved this here so that all pending events are processed - // before starting to delete any objects. This behaves better (in - // particular, wrt wxPostEvent) and is coherent with wxGTK's current - // behaviour. Also removed the '#if wxUSE_THREADS' around it. - // Changed Mar/2000 before 2.1.14 - - // Flush pending events. - ProcessPendingEvents(); - - // '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; + wxPerDisplayDataMap::iterator it = m.find( display ); + if( it != m.end() && it->second != NULL ) + return *(it->second); - wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; - node = node->GetNext(); - } + wxPerDisplayData* nData = new wxPerDisplayData(); + m[display] = nData; - return needMore; + return *nData; } -// Send idle event to window and all subwindows -bool wxApp::SendIdleEvents(wxWindow* win) +wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display ) { - bool needMore = FALSE; + wxPerDisplayData& data = GetOrCreatePerDisplayData( *m_perDisplayData, + display ); + if( data.m_visualInfo ) + return data.m_visualInfo; - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); - - if (event.MoreRequested()) - needMore = TRUE; + wxXVisualInfo* vi = new wxXVisualInfo; + wxFillXVisualInfo( vi, (Display*)display ); - wxWindowList::Node* node = win->GetChildren().GetFirst(); - while (node) - { - wxWindow* win = node->GetData(); - if (SendIdleEvents(win)) - needMore = TRUE; + data.m_visualInfo = vi; - node = node->GetNext(); - } - return needMore ; + return vi; } -void wxApp::DeletePendingObjects() +static void wxTLWidgetDestroyCallback(Widget w, XtPointer WXUNUSED(clientData), + XtPointer WXUNUSED(ptr)) { - wxList::Node *node = wxPendingDelete.GetFirst(); - while (node) + if( wxTheApp ) { - wxObject *obj = node->GetData(); - - 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.GetFirst(); + wxTheApp->SetTopLevelWidget( (WXDisplay*)XtDisplay(w), + (WXWidget)NULL ); + wxTheApp->SetTopLevelRealizedWidget( (WXDisplay*)XtDisplay(w), + (WXWidget)NULL ); } } -static char *fallbackResources[] = { - "*menuBar.marginHeight: 0", - "*menuBar.shadowThickness: 1", - "*background: #c0c0c0", - "*foreground: black", - NULL -}; - -// Create an application context -bool wxApp::OnInitGui() +WXWidget wxCreateTopLevelWidget( WXDisplay* display ) { - if( !wxAppBase::OnInitGui() ) - return FALSE; - - XtToolkitInitialize() ; - wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext(); - XtAppSetFallbackResources((XtAppContext) wxTheApp->m_appContext, fallbackResources); - - Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL, - wxTheApp->GetClassName().c_str(), NULL, 0, -# if XtSpecificationRelease < 5 - (Cardinal*) &argc, -# else - &argc, -# endif - argv); - - if (!dpy) { - // if you don't log to stderr, nothing will be shown... - delete wxLog::SetActiveTarget(new wxLogStderr); - wxString className(wxTheApp->GetClassName()); - wxLogError(_("wxWindows could not open display for '%s': exiting."), - className.c_str()); - exit(-1); - } - m_initialDisplay = (WXDisplay*) dpy; - -#ifdef __WXDEBUG__ - // install the X error handler - gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler); -#endif // __WXDEBUG__ - - wxTheApp->m_topLevelWidget = - (WXWidget) XtAppCreateShell((String)NULL, - wxTheApp->GetClassName().c_str(), - applicationShellWidgetClass,dpy, - NULL,0) ; - - // 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); - - wxAddIdleCallback(); - - return TRUE; + 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; } -WXColormap wxApp::GetMainColormap(WXDisplay* display) +WXWidget wxCreateTopLevelRealizedWidget( WXDisplay* WXUNUSED(display) ) { - if (!display) /* Must be called first with non-NULL display */ - return m_mainColormap; + Widget rTlw = XtVaCreateWidget( "dummy_widget", topLevelShellWidgetClass, + (Widget)wxTheApp->GetTopLevelWidget(), + NULL ); + XtSetMappedWhenManaged( rTlw, False ); + XtRealizeWidget( rTlw ); - int defaultScreen = DefaultScreen((Display*) display); - Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen); + return (WXWidget)rTlw; +} - Colormap c = DefaultColormapOfScreen(screen); +WXWidget wxApp::GetTopLevelWidget() +{ + WXDisplay* display = wxGetDisplay(); + wxPerDisplayData& data = GetOrCreatePerDisplayData( *m_perDisplayData, + display ); + if( data.m_topLevelWidget ) + return (WXWidget)data.m_topLevelWidget; - if (!m_mainColormap) - m_mainColormap = (WXColormap) c; + WXWidget tlw = wxCreateTopLevelWidget( display ); + SetTopLevelWidget( display, tlw ); - return (WXColormap) c; + return tlw; } -wxXVisualInfo* wxApp::GetVisualInfo( WXDisplay* display ) +WXWidget wxApp::GetTopLevelRealizedWidget() { - wxXVisualInfoMap::iterator it = m_visualInfoMap->find( display ); + WXDisplay* display = wxGetDisplay(); + wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display ); - if( it != m_visualInfoMap->end() ) return it->second; - - wxXVisualInfo* vi = new wxXVisualInfo; - wxFillXVisualInfo( vi, (Display*)display ); + if( it != m_perDisplayData->end() && it->second->m_topLevelRealizedWidget ) + return (WXWidget)it->second->m_topLevelRealizedWidget; - (*m_visualInfoMap)[display] = vi; + WXWidget rTlw = wxCreateTopLevelRealizedWidget( display ); + SetTopLevelRealizedWidget( display, rTlw ); - return vi; + return rTlw; } -void wxExit() +void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget) { - int retValue = 0; - if (wxTheApp) - retValue = wxTheApp->OnExit(); + GetOrCreatePerDisplayData( *m_perDisplayData, display ) + .m_topLevelWidget = (Widget)widget; +} - wxApp::CleanUp(); - /* - * Exit in some platform-specific way. - * Not recommended that the app calls this: - * only for emergencies. - */ - exit(retValue); +void wxApp::SetTopLevelRealizedWidget(WXDisplay* display, WXWidget widget) +{ + GetOrCreatePerDisplayData( *m_perDisplayData, display ) + .m_topLevelRealizedWidget = (Widget)widget; } // Yield to other processes bool wxApp::Yield(bool onlyIfNeeded) { - bool s_inYield = FALSE; + static bool s_inYield = false; if ( s_inYield ) { @@ -552,17 +481,18 @@ bool wxApp::Yield(bool onlyIfNeeded) wxFAIL_MSG( wxT("wxYield called recursively" ) ); } - return FALSE; + return false; } - s_inYield = TRUE; + s_inYield = true; + wxEventLoopGuarantor dummyLoopIfNeeded; while (wxTheApp && wxTheApp->Pending()) wxTheApp->Dispatch(); - s_inYield = FALSE; + s_inYield = false; - return TRUE; + return true; } // ----------------------------------------------------------------------------