Better fix

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

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 2c179d7a2d903466c13a83415c0e97baf2b1e6d9..6208995cd0df97d15d4c513b36dde0c6349f4555 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -1,608 +1,504 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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
 // 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/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_THREADS
-#include "wx/thread.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
 
 #endif
 

-#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
+#include "wx/evtloop.h"
+
+#if wxUSE_THREADS
+    #include "wx/thread.h"

 #endif
 
 #endif
 

+#ifdef __VMS__
+    #pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 #include <X11/Xatom.h>

+#ifdef __VMS__
+    #pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 #include <string.h>
 
 
 #include "wx/motif/private.h"
 
 #include <string.h>
 

-extern char *wxBuffer;
-extern wxList wxPendingDelete;
+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 );

 
 

-wxApp *wxTheApp = NULL;
+extern bool wxAddIdleCallback();

 
 wxHashTable *wxWidgetHashTable = NULL;
 
 
 wxHashTable *wxWidgetHashTable = NULL;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
-#endif

 
 

-long wxApp::sm_lastMessageTime = 0;
+#ifdef __WXDEBUG__
+extern "C"
+{
+    typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
+}
+
+XErrorHandlerFunc gs_pfnXErrorHandler = 0;

 
 

-bool wxApp::Initialize()
+extern "C"

 {
 {

-#ifdef __WXMSW__
-    wxBuffer = new char[1500];
-#else
-    wxBuffer = new char[BUFSIZ + 512];
-#endif
-    
-    wxClassInfo::InitializeClasses();
-    
-    wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-    wxTheColourDatabase->Initialize();
-    
-    wxInitializeStockLists();
-    wxInitializeStockObjects();
-    
-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
-    
-    // For PostScript printing
-#if wxUSE_POSTSCRIPT
-    /* Done using wxModule now
-    wxInitializePrintSetupData();
-    wxThePrintPaperDatabase = new wxPrintPaperDatabase;
-    wxThePrintPaperDatabase->CreateDatabase();
-    */
-#endif
-    
-    wxBitmap::InitStandardHandlers();
-    
-    wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-    
-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) return FALSE;
-    
-    return TRUE;
+
+static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
+{
+    // just forward to the default handler for now
+    return gs_pfnXErrorHandler(dpy, xevent);

 }
 
 }
 

-void wxApp::CleanUp()
+}
+#endif // __WXDEBUG__
+
+bool wxApp::Initialize(int& argc_, wxChar **argv_)

 {
 {

-    delete wxWidgetHashTable;
-    wxWidgetHashTable = NULL;
-    
-    wxModule::CleanUpModules();
-    
-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
-    
-    wxDeleteStockObjects() ;
-    
-    // Destroy all GDI lists, etc.
-    
-    delete wxTheBrushList;
-    wxTheBrushList = NULL;
-    
-    delete wxThePenList;
-    wxThePenList = NULL;
-    
-    delete wxTheFontList;
-    wxTheFontList = NULL;
-    
-    delete wxTheBitmapList;
-    wxTheBitmapList = NULL;
-    
-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
-    
-#if wxUSE_POSTSCRIPT
-    /* Done using wxModule now
-    wxInitializePrintSetupData(FALSE);
-    delete wxThePrintPaperDatabase;
-    wxThePrintPaperDatabase = NULL;
-    */
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());

 #endif
 #endif

-    
-    wxBitmap::CleanUpHandlers();
-    
-    delete[] wxBuffer;
-    wxBuffer = NULL;
-    
-    wxClassInfo::CleanUpClasses();
-    
-    delete wxTheApp;
-    wxTheApp = NULL;
-    
-#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)
+
+    if ( !wxAppBase::Initialize(argc_, argv_) )
+        return false;
+
+    wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
+
+#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 )

     {
     {

-        wxLogDebug("There were memory leaks.\n");
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
+        loc = getenv("LC_ALL");
+        if ( loc )
+            fixAll = true;

     }
     }

-#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);
-}

 
 

-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
-    
-    if (!wxApp::Initialize())
-        return FALSE;
-    
-    if (!wxTheApp)
+    if ( !loc ||
+            (loc[0] == 'C' && loc[1] == '\0') ||
+                strcmp(loc, "POSIX") == 0 )

     {
     {

-        if (!wxApp::GetInitializerFunction())
-        {
-            printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-            return 0;
-        };
-        
-        wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
+        // 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__
+
+    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

     };
     };

-    
-    if (!wxTheApp)
+    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 = _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++ )

     {
     {

-        printf( "wxWindows error: wxTheApp == NULL\n" );
-        return 0;
-    };
-    
-    wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
-    wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
-    
-    wxTheApp->argc = argc;
-    wxTheApp->argv = argv;
-    
-    // GUI-specific initialization, such as creating an app context.
-    wxTheApp->OnInitGui();
-    
-    // Here frames insert themselves automatically
-    // into wxTopLevelWindows by getting created
-    // in OnInit().
-    
-    int retValue = 0;
-    if (wxTheApp->OnInit())
+        argvX11[i] = strdup(wxConvLibc.cWX2MB(argv_[i]));
+    }
+
+    argvX11[argc] = NULL;
+
+    int argcX11 = argc;
+
+    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);
+
+    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_));
+            }
+        }
+
+        argc = argcX11;
+
+        // update internal arg[cv] as X11 may have removed processed options:
+        argc = argc_;
+        argv = argv_;
+    }
+    //else: XtOpenDisplay() didn't modify our parameters
+
+    // free our copy
+    for ( i = 0; i < argcX11; i++ )

     {
     {

-        if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+        free(argvX11[i]);
+    }
+
+    delete [] argvX11;
+
+#else // ANSI
+
+    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);
+
+#endif // Unicode/ANSI
+
+    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);

     }
     }

-    
-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
-    
-    delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
-    // for further messages
-    
-    if (wxTheApp->GetTopWindow())
+    m_initialDisplay = (WXDisplay*) dpy;
+
+#ifdef __WXDEBUG__
+    // install the X error handler
+    gs_pfnXErrorHandler = XSetErrorHandler(wxXErrorHandler);
+#endif // __WXDEBUG__
+
+    // Add general resize proc
+    XtActionsRec rec;
+    rec.string = wxMOTIF_STR("resize");
+    rec.proc = (XtActionProc)wxWidgetResizeProc;
+    XtAppAddActions((XtAppContext) wxTheApp->m_appContext, &rec, 1);
+
+    GetMainColormap(dpy);
+
+    wxAddIdleCallback();
+
+    return true;
+}
+
+void wxApp::CleanUp()
+{
+    wxAppBase::CleanUp();
+
+    delete wxWidgetHashTable;
+    wxWidgetHashTable = NULL;
+
+    delete m_mainLoop;
+
+    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();
     wxApp::CleanUp();

-    
-    return retValue;
-};

 
 

-// Static member initialization
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+    wxAppConsole::Exit();
+}
+
+// ============================================================================
+// wxApp
+// ============================================================================

 
 wxApp::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_mainColormap = (WXColormap) NULL;
     m_appContext = (WXAppContext) NULL;

-    m_topLevelWidget = (WXWidget) NULL;
-    m_maxRequestSize = 0;

     m_initialDisplay = (WXDisplay*) 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()
 {
 }
 
 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
     * use an Xt-eventhandler.
     */
     /*
     * 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
     * use an Xt-eventhandler.
     */

-    
+

     XSelectInput(XtDisplay((Widget) wxTheApp->GetTopLevelWidget()),
         XDefaultRootWindow(XtDisplay((Widget) wxTheApp->GetTopLevelWidget())),
         PropertyChangeMask);
     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);
-        
-        ProcessXEvent((WXEvent*) & event);
-        
-        if (XtAppPending( (XtAppContext) wxTheApp->GetAppContext() ) == 0)
-        {
-            if (!ProcessIdle())
-            { 
-                // TODO: Robert, what's this for?
-#if wxUSE_THREADS
-                wxMutexGuiLeave();
-                usleep(20);  
-                wxMutexGuiEnter();
-#endif
-            }
-        }
-        
-    }
-    
+
+    m_mainLoop->Run();
+

     return 0;
 }
 
     return 0;
 }
 

-// Processes an X event.
-void wxApp::ProcessXEvent(WXEvent* _event)
+// This should be redefined in a derived class for
+// handling property change events for XAtom IPC.
+void wxApp::HandlePropertyChange(WXEvent *event)

 {
 {

-    XEvent* event = (XEvent*) _event;
-    
-    if ((event->type == KeyPress) && CheckForAccelerator(_event))
-    {
-        // Do nothing! We intercepted and processed the event as an accelerator.
-        return;
-    }
-    else if (event->type == PropertyNotify)
-    {
-        HandlePropertyChange(_event);
-        return;
-    }
-    else if (event->type == ResizeRequest)
-    {
-    /* Terry Gitnick <terryg@scientech.com> - 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.
-        */
-        
-        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);
-    }
-    else
-    {
-        XtDispatchEvent(event);
-    }
+    // by default do nothing special
+    XtDispatchEvent((XEvent*) event); /* let Motif do the work */

 }
 
 }
 

-// Returns TRUE if more time is needed.
-bool wxApp::ProcessIdle()
+WXColormap wxApp::GetMainColormap(WXDisplay* display)

 {
 {

-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
-    
-    return event.MoreRequested();
-}
+    if (!display) /* Must be called first with non-NULL display */
+        return m_mainColormap;

 
 

-void wxApp::ExitMainLoop()
-{
-    m_keepGoing = FALSE;
-}
+    int defaultScreen = DefaultScreen((Display*) display);
+    Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen);

 
 

-// Is a message/event pending?
-bool wxApp::Pending()
-{
-    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) ;
-}
+    Colormap c = DefaultColormapOfScreen(screen);

 
 

-// Dispatch a message.
-void wxApp::Dispatch()
-{
-    //    XtAppProcessEvent( (XtAppContext) wxTheApp->GetAppContext(), XtIMAll);
-    
-    XEvent event;
-    XtAppNextEvent((XtAppContext) GetAppContext(), &event);
-    ProcessXEvent((WXEvent*) & event);
+    if (!m_mainColormap)
+        m_mainColormap = (WXColormap) c;
+
+    return (WXColormap) c;

 }
 
 }
 

-// This should be redefined in a derived class for
-// handling property change events for XAtom IPC.
-void wxApp::HandlePropertyChange(WXEvent *event)
+static inline wxPerDisplayData& GetOrCreatePerDisplayData
+    ( wxPerDisplayDataMap& m, WXDisplay* display )

 {
 {

-    // by default do nothing special
-    XtDispatchEvent((XEvent*) event); /* let Motif do the work */
+    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;

 }
 
 }
 

-void wxApp::OnIdle(wxIdleEvent& event)
+wxXVisualInfo* wxApp::GetVisualInfo( 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();
-    
-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
-    
-    // Send OnIdle events to all windows
-    bool needMore = SendIdleEvents();
-    
-    if (needMore)
-        event.RequestMore(TRUE);
-    
-    inOnIdle = FALSE;
+    wxPerDisplayData& data = GetOrCreatePerDisplayData( *m_perDisplayData,
+                                                        display );
+    if( data.m_visualInfo )
+        return data.m_visualInfo;
+
+    wxXVisualInfo* vi = new wxXVisualInfo;
+    wxFillXVisualInfo( vi, (Display*)display );
+
+    data.m_visualInfo = vi;
+
+    return vi;

 }
 
 }
 

-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
+static void wxTLWidgetDestroyCallback(Widget w, XtPointer WXUNUSED(clientData),
+                                      XtPointer WXUNUSED(ptr))

 {
 {

-    bool needMore = FALSE;
-    wxNode* node = wxTopLevelWindows.First();
-    while (node)
+    if( wxTheApp )

     {
     {

-        wxWindow* win = (wxWindow*) node->Data();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-        
-        node = node->Next();
+        wxTheApp->SetTopLevelWidget( (WXDisplay*)XtDisplay(w),
+                                     (WXWidget)NULL );
+        wxTheApp->SetTopLevelRealizedWidget( (WXDisplay*)XtDisplay(w),
+                                             (WXWidget)NULL );

     }
     }

-    return needMore;

 }
 
 }
 

-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
+WXWidget wxCreateTopLevelWidget( WXDisplay* display )

 {
 {

-    bool needMore = FALSE;
-    
-    wxIdleEvent event;
-    event.SetEventObject(win);
-    win->ProcessEvent(event);
-    
-    if (event.MoreRequested())
-        needMore = TRUE;
-    
-    wxNode* node = win->GetChildren().First();
-    while (node)
-    {
-        wxWindow* win = (wxWindow*) node->Data();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-        
-        node = node->Next();
-    }
-    return needMore ;
+    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;

 }
 
 }
 

-void wxApp::DeletePendingObjects()
+WXWidget wxCreateTopLevelRealizedWidget( WXDisplay* WXUNUSED(display) )

 {
 {

-    wxNode *node = wxPendingDelete.First();
-    while (node)
-    {
-        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();
-    }
+    Widget rTlw = XtVaCreateWidget( "dummy_widget", topLevelShellWidgetClass,
+                                    (Widget)wxTheApp->GetTopLevelWidget(),
+                                     NULL );
+    XtSetMappedWhenManaged( rTlw, False );
+    XtRealizeWidget( rTlw );
+
+    return (WXWidget)rTlw;

 }
 
 }
 

-wxLog* wxApp::CreateLogTarget()
+WXWidget wxApp::GetTopLevelWidget()

 {
 {

-    return new wxLogGui;
+    WXDisplay* display = wxGetDisplay();
+    wxPerDisplayData& data = GetOrCreatePerDisplayData( *m_perDisplayData,
+                                                        display );
+    if( data.m_topLevelWidget )
+        return (WXWidget)data.m_topLevelWidget;
+
+    WXWidget tlw = wxCreateTopLevelWidget( display );
+    SetTopLevelWidget( display, tlw );
+
+    return tlw;

 }
 
 }
 

-wxWindow* wxApp::GetTopWindow() const
+WXWidget wxApp::GetTopLevelRealizedWidget()

 {
 {

-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.Number() > 0)
-        return (wxWindow*) wxTopLevelWindows.First()->Data();
-    else
-        return NULL;
+    WXDisplay* display = wxGetDisplay();
+    wxPerDisplayDataMap::iterator it = m_perDisplayData->find( display );
+
+    if( it != m_perDisplayData->end() && it->second->m_topLevelRealizedWidget )
+        return (WXWidget)it->second->m_topLevelRealizedWidget;
+
+    WXWidget rTlw = wxCreateTopLevelRealizedWidget( display );
+    SetTopLevelRealizedWidget( display, rTlw );
+
+    return rTlw;

 }
 
 }
 

-// Create an application context
-bool wxApp::OnInitGui()
+void wxApp::SetTopLevelWidget(WXDisplay* display, WXWidget widget)

 {
 {

-    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);
-    }
-    m_initialDisplay = (WXDisplay*) dpy;
-    
-    wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
-        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);
-    
-    return TRUE;
+    GetOrCreatePerDisplayData( *m_perDisplayData, display )
+        .m_topLevelWidget = (Widget)widget;

 }
 
 }
 

-WXColormap wxApp::GetMainColormap(WXDisplay* display)
+void wxApp::SetTopLevelRealizedWidget(WXDisplay* display, WXWidget widget)

 {
 {

-    if (!display) /* Must be called first with non-NULL display */
-        return m_mainColormap;
-    
-    Colormap c =
-        DefaultColormapOfScreen(XScreenOfDisplay((Display*) display,
-        DefaultScreen((Display*) display)));
-    
-    if (!m_mainColormap)
-        m_mainColormap = (WXColormap) c;
-    
-    return (WXColormap) c;
+    GetOrCreatePerDisplayData( *m_perDisplayData, display )
+        .m_topLevelRealizedWidget = (Widget)widget;

 }
 
 }
 

-// Returns TRUE if an accelerator has been processed
-bool wxApp::CheckForAccelerator(WXEvent* event)
+// Yield to other processes
+
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

-    XEvent* xEvent = (XEvent*) event;
-    if (xEvent->xany.type == KeyPress)
+    static bool s_inYield = false;
+
+    if ( s_inYield )

     {
     {

-        // Find a wxWindow for this window
-        // TODO: should get display for the window, not the current display
-        Widget widget = XtWindowToWidget((Display*) wxGetDisplay(), xEvent->xany.window);
-        wxWindow* win = NULL;
-        
-        // Find the first wxWindow that corresponds to this event window
-        while (widget && !(win = wxGetWindowFromTable(widget)))
-            widget = XtParent(widget);
-        
-        if (!widget || !win)
-            return FALSE;
-        
-        wxKeyEvent keyEvent(wxEVT_CHAR);
-        wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
-        
-        // Now we have a wxKeyEvent and we have a wxWindow.
-        // Go up the hierarchy until we find a matching accelerator,
-        // or we get to the top.
-        while (win)
+        if ( !onlyIfNeeded )

         {
         {

-            if (win->ProcessAccelerator(keyEvent))
-                return TRUE;
-            win = win->GetParent();
+            wxFAIL_MSG( wxT("wxYield called recursively" ) );

         }
         }

-        return FALSE;
+
+        return false;

     }
     }

-    return FALSE;
-}

 
 

-void wxExit()
-{
-    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);
-}
+    s_inYield = true;

 
 

-// Yield to other processes
-bool wxYield()
-{

     while (wxTheApp && wxTheApp->Pending())
         wxTheApp->Dispatch();
     while (wxTheApp && wxTheApp->Pending())
         wxTheApp->Dispatch();

-    return TRUE;
+
+    s_inYield = false;
+
+    return true;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// accessors for C modules
+// ----------------------------------------------------------------------------
+
+extern "C" XtAppContext wxGetAppContext()
+{
+    return (XtAppContext)wxTheApp->GetAppContext();
+}