Fit the generic preferences editor dialog to its pages size initially.

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index e1a0d8027ecc0eb7dabd579b59e1b6a4267ebc6b..775f77de6b91fd5b4bbd6eab48c07eb7d85e691f 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.cpp
+// Name:        src/x11/app.cpp

 // Purpose:     wxApp
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxApp
 // Author:      Julian Smart
 // Modified by:


@@ -9,35 +9,36 @@
 // 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/icon.h"
-#include "wx/dialog.h"
-#include "wx/log.h"
-#include "wx/module.h"
-#include "wx/memory.h"
-#include "wx/log.h"
-#include "wx/intl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/hash.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/frame.h"
+    #include "wx/icon.h"
+    #include "wx/dialog.h"
+    #include "wx/memory.h"
+    #include "wx/gdicmn.h"
+    #include "wx/module.h"
+    #include "wx/crt.h"
+#endif
+

 #include "wx/evtloop.h"
 #include "wx/evtloop.h"

-#include "wx/timer.h"
+#include "wx/filename.h"

 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"

+#include "wx/generic/private/timer.h"

 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 

-#if wxUSE_WX_RESOURCES
-    #include "wx/resource.h"
-#endif
-

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


@@ -46,18 +47,10 @@
 //   global data
 //------------------------------------------------------------------------
 
 //   global data
 //------------------------------------------------------------------------
 

-extern wxList wxPendingDelete;
-
-wxHashTable *wxWidgetHashTable = NULL;
-wxHashTable *wxClientWidgetHashTable = NULL;
+wxWindowHash *wxWidgetHashTable = NULL;
+wxWindowHash *wxClientWidgetHashTable = NULL;

 
 

-wxApp *wxTheApp = NULL;
-
-// This is set within wxEntryStart -- too early on
-// to put these in wxTheApp
-static int g_newArgc = 0;
-static wxChar** g_newArgv = NULL;
-static bool g_showIconic = FALSE;
+static bool g_showIconic = false;

 static wxSize g_initialSize = wxDefaultSize;
 
 // This is required for wxFocusEvent::SetWindow(). It will only
 static wxSize g_initialSize = wxDefaultSize;
 
 // This is required for wxFocusEvent::SetWindow(). It will only


@@ -71,7 +64,6 @@ static wxWindow *g_prevFocus = NULL;
 //   X11 error handling
 //------------------------------------------------------------------------
 
 //   X11 error handling
 //------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__

 typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
 
 XErrorHandlerFunc gs_pfnXErrorHandler = 0;
 typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
 
 XErrorHandlerFunc gs_pfnXErrorHandler = 0;


@@ -84,341 +76,153 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
     else
         return 0;
 }
     else
         return 0;
 }

-#endif // __WXDEBUG__

 
 //------------------------------------------------------------------------
 //   wxApp
 //------------------------------------------------------------------------
 
 long wxApp::sm_lastMessageTime = 0;
 
 //------------------------------------------------------------------------
 //   wxApp
 //------------------------------------------------------------------------
 
 long wxApp::sm_lastMessageTime = 0;

-WXDisplay *wxApp::ms_display = NULL;

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

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
-
-bool wxApp::Initialize()
+bool wxApp::Initialize(int& argC, wxChar **argV)

 {
 {

-    wxClassInfo::InitializeClasses();
-
-    // 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
-
-    wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
-    wxTheColourDatabase->Initialize();
-
-    wxInitializeStockLists();
-    wxInitializeStockObjects();
-
-#if wxUSE_WX_RESOURCES
-    wxInitializeResourceSystem();
-#endif
-
-    wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-    wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-
-    wxModule::RegisterModules();
-    if (!wxModule::InitializeModules()) return FALSE;
-
-    return TRUE;
-}
-
-void wxApp::CleanUp()
-{
-    if (g_newArgv)
-        delete[] g_newArgv;
-    g_newArgv = NULL;
-
-    delete wxWidgetHashTable;
-    wxWidgetHashTable = NULL;
-    delete wxClientWidgetHashTable;
-    wxClientWidgetHashTable = NULL;
-
-    wxModule::CleanUpModules();
-
-#if wxUSE_WX_RESOURCES
-    wxCleanUpResourceSystem();
-#endif
-
-    delete wxTheColourDatabase;
-    wxTheColourDatabase = NULL;
-
-    wxDeleteStockObjects();
-    
-    wxDeleteStockLists();
-
-    delete wxTheApp;
-    wxTheApp = NULL;
-
-    wxClassInfo::CleanUpClasses();
-
-#if wxUSE_THREADS
-    delete wxPendingEvents;
-    delete wxPendingEventsLocker;
-#endif
-
-#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)
-    {
-        wxLogDebug("There were memory leaks.");
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-#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);
-}
-
-// NB: argc and argv may be changed here, pass by reference!
-int wxEntryStart( int& argc, char *argv[] )
-{
-#ifdef __WXDEBUG__

 #if !wxUSE_NANOX
     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
 #endif
 #if !wxUSE_NANOX
     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
 #endif

-#endif // __WXDEBUG__

 
     wxString displayName;
 
     wxString displayName;

-    bool syncDisplay = FALSE;
-
-    // Parse the arguments.
-    // We can't use wxCmdLineParser or OnInitCmdLine and friends because
-    // we have to create the Display earlier. If we can find a way to
-    // use the wxAppBase API then I'll be quite happy to change it.
-    g_newArgv = new wxChar*[argc];
-    g_newArgc = 0;
-    int i;
-    for (i = 0; i < argc; i++)
+    bool syncDisplay = false;
+
+    int argCOrig = argC;
+    for ( int i = 0; i < argCOrig; i++ )

     {
     {

-        wxString arg(argv[i]);
-        if (arg == wxT("-display"))
+        if (wxStrcmp( argV[i], wxT("-display") ) == 0)

         {
         {

-            if (i < (argc - 1))
+            if (i < (argCOrig - 1))

             {
             {

-                i ++;
-                displayName = argv[i];
-                continue;
+                argV[i++] = NULL;
+
+                displayName = argV[i];
+
+                argV[i] = NULL;
+                argC -= 2;

             }
         }
             }
         }

-        else if (arg == wxT("-geometry"))
+        else if (wxStrcmp( argV[i], wxT("-geometry") ) == 0)

         {
         {

-            if (i < (argc - 1))
+            if (i < (argCOrig - 1))

             {
             {

-                i ++;
-                wxString windowGeometry = argv[i];
+                argV[i++] = NULL;
+

                 int w, h;
                 int w, h;

-                if (wxSscanf(windowGeometry.c_str(), _T("%dx%d"), &w, &h) != 2)
+                if (wxSscanf(argV[i], wxT("%dx%d"), &w, &h) != 2)

                 {
                 {

-                    wxLogError(_("Invalid geometry specification '%s'"), windowGeometry.c_str());
+                    wxLogError( _("Invalid geometry specification '%s'"),
+                                wxString(argV[i]).c_str() );

                 }
                 else
                 {
                     g_initialSize = wxSize(w, h);
                 }
                 }
                 else
                 {
                     g_initialSize = wxSize(w, h);
                 }

-                continue;
+
+                argV[i] = NULL;
+                argC -= 2;

             }
         }
             }
         }

-        else if (arg == wxT("-sync"))
+        else if (wxStrcmp( argV[i], wxT("-sync") ) == 0)

         {
         {

-            syncDisplay = TRUE;
-            continue;
+            syncDisplay = true;
+
+            argV[i] = NULL;
+            argC--;

         }
         }

-        else if (arg == wxT("-iconic"))
+        else if (wxStrcmp( argV[i], wxT("-iconic") ) == 0)

         {
         {

-            g_showIconic = TRUE;
+            g_showIconic = true;

 
 

-            continue;
+            argV[i] = NULL;
+            argC--;

         }
         }

-
-        // Not eaten by wxWindows, so pass through
-        g_newArgv[g_newArgc] = argv[i];
-        g_newArgc ++;

     }
 
     }
 

-    Display* xdisplay = NULL;
-    if (displayName.IsEmpty())
-        xdisplay = XOpenDisplay(NULL);
-    else
-        xdisplay = XOpenDisplay((char*) displayName.c_str());
-
-    if (!xdisplay)
+    if ( argC != argCOrig )

     {
     {

-        wxLogError( _("wxWindows could not open display. Exiting.") );
-        return -1;
+        // remove the arguments we consumed
+        for ( int i = 0; i < argC; i++ )
+        {
+            while ( !argV[i] )
+            {
+                memmove(argV + i, argV + i + 1, (argCOrig - i)*sizeof(wxChar *));
+            }
+        }

     }
 
     }
 

-    if (syncDisplay)
+    // open and set up the X11 display
+    if ( !wxSetDisplay(displayName) )

     {
     {

-        XSynchronize(xdisplay, True);
+        wxLogError(_("wxWidgets could not open display. Exiting."));
+        return false;

     }
     }

-    
-    wxApp::ms_display = (WXDisplay*) xdisplay;
-    
-    XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
-        
-    wxSetDetectableAutoRepeat( TRUE );

 
 

-    if (!wxApp::Initialize())
-        return -1;
-
-    return 0;
-}
+    Display *dpy = wxGlobalDisplay();
+    if (syncDisplay)
+        XSynchronize(dpy, True);

 
 

-int wxEntryInitGui()
-{
-    int retValue = 0;
+    XSelectInput(dpy, XDefaultRootWindow(dpy), PropertyChangeMask);

 
 

-    if ( !wxTheApp->OnInitGui() )
-        retValue = -1;
+    wxSetDetectableAutoRepeat( true );

 
 

-    return retValue;
-}

 
 

+    if ( !wxAppBase::Initialize(argC, argV) )
+        return false;

 
 

-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();
+#if wxUSE_UNICODE
+    // Glib's type system required by Pango
+    g_type_init();

 #endif
 #endif

-    int err = wxEntryStart(argc, argv);
-    if (err)
-        return err;

 
 

-    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;
-    };
-
-    wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
-    wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
-
-    // The command line may have been changed
-    // by stripping out -display etc.
-    if (g_newArgc > 0)
-    {
-        wxTheApp->argc = g_newArgc;
-        wxTheApp->argv = g_newArgv;
-    }
-    else
-    {
-        wxTheApp->argc = argc;
-        wxTheApp->argv = argv;
-    }
-    wxTheApp->m_showIconic = g_showIconic;
-    wxTheApp->m_initialSize = g_initialSize;
-
-    int retValue;
-    retValue = wxEntryInitGui();
-
-    // Here frames insert themselves automatically into wxTopLevelWindows by
-    // getting created in OnInit().
-    if ( retValue == 0 )
-    {
-        if ( !wxTheApp->OnInit() )
-            retValue = -1;
-    }
-
-    if ( retValue == 0 )
-    {
-        if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
-    }
-
-    // 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())
-    {
-        delete wxTheApp->GetTopWindow();
-        wxTheApp->SetTopWindow(NULL);
-    }
-
-    wxTheApp->DeletePendingObjects();
+#if wxUSE_INTL
+    wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif

 
 

-    wxTheApp->OnExit();
+    wxWidgetHashTable = new wxWindowHash;
+    wxClientWidgetHashTable = new wxWindowHash;

 
 

-    wxApp::CleanUp();
+    return true;
+}

 
 

-    return retValue;
-};
+void wxApp::CleanUp()
+{
+    wxDELETE(wxWidgetHashTable);
+    wxDELETE(wxClientWidgetHashTable);

 
 

-// Static member initialization
-wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
+    wxAppBase::CleanUp();
+}

 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {

-    m_topWindow = NULL;
-    wxTheApp = this;
-    m_className = "";
-    m_wantDebugOutput = TRUE ;
-    m_appName = "";
-    argc = 0;
-    argv = NULL;
-    m_exitOnFrameDelete = TRUE;
-    m_mainColormap = (WXColormap) NULL;
-    m_topLevelWidget = (WXWindow) NULL;
+    m_mainColormap = NULL;
+    m_topLevelWidget = NULL;

     m_maxRequestSize = 0;
     m_maxRequestSize = 0;

-    m_mainLoop = NULL;
-    m_showIconic = FALSE;
+    m_showIconic = false;

     m_initialSize = wxDefaultSize;
     m_initialSize = wxDefaultSize;

-}

 
 

-bool wxApp::Initialized()
-{
-    if (GetTopWindow())
-        return TRUE;
-    else
-        return FALSE;
+#if !wxUSE_NANOX
+    m_visualInfo = NULL;
+#endif

 }
 
 }
 

-int wxApp::MainLoop()
+wxApp::~wxApp()

 {
 {

-    int rt;
-    m_mainLoop = new wxEventLoop;
-
-    rt = m_mainLoop->Run();
-
-    delete m_mainLoop;
-    m_mainLoop = NULL;
-    return rt;
+#if !wxUSE_NANOX
+    delete m_visualInfo;
+#endif

 }
 
 #if !wxUSE_NANOX
 }
 
 #if !wxUSE_NANOX

+

 //-----------------------------------------------------------------------
 // X11 predicate function for exposure compression
 //-----------------------------------------------------------------------
 //-----------------------------------------------------------------------
 // X11 predicate function for exposure compression
 //-----------------------------------------------------------------------


@@ -429,32 +233,33 @@ struct wxExposeInfo
     Bool found_non_matching;
 };
 
     Bool found_non_matching;
 };
 

-static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg)
+extern "C"
+Bool wxX11ExposePredicate (Display *WXUNUSED(display), XEvent *xevent, XPointer arg)

 {
     wxExposeInfo *info = (wxExposeInfo*) arg;
 {
     wxExposeInfo *info = (wxExposeInfo*) arg;

-    
+

     if (info->found_non_matching)
        return FALSE;
     if (info->found_non_matching)
        return FALSE;

-    
+

     if (xevent->xany.type != Expose)
     {
     if (xevent->xany.type != Expose)
     {

-        info->found_non_matching = TRUE;
+        info->found_non_matching = true;

         return FALSE;
     }
         return FALSE;
     }

-    
+

     if (xevent->xexpose.window != info->window)
     {
     if (xevent->xexpose.window != info->window)
     {

-        info->found_non_matching = TRUE;
+        info->found_non_matching = true;

         return FALSE;
     }
         return FALSE;
     }

-    
+

     return TRUE;
 }
     return TRUE;
 }

-#endif
-    // wxUSE_NANOX
+
+#endif // wxUSE_NANOX

 
 //-----------------------------------------------------------------------
 
 //-----------------------------------------------------------------------

-// Processes an X event, returning TRUE if the event was processed.
+// Processes an X event, returning true if the event was processed.

 //-----------------------------------------------------------------------
 
 bool wxApp::ProcessXEvent(WXEvent* _event)
 //-----------------------------------------------------------------------
 
 bool wxApp::ProcessXEvent(WXEvent* _event)


@@ -463,14 +268,16 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
     wxWindow* win = NULL;
     Window window = XEventGetWindow(event);
 
     wxWindow* win = NULL;
     Window window = XEventGetWindow(event);

+#if 0

     Window actualWindow = window;
     Window actualWindow = window;

+#endif

 
     // Find the first wxWindow that corresponds to this event window
     // Because we're receiving events after a window
     // has been destroyed, assume a 1:1 match between
     // Window and wxWindow, so if it's not in the table,
     // it must have been destroyed.
 
     // Find the first wxWindow that corresponds to this event window
     // Because we're receiving events after a window
     // has been destroyed, assume a 1:1 match between
     // Window and wxWindow, so if it's not in the table,
     // it must have been destroyed.

-    
+

     win = wxGetWindowFromTable(window);
     if (!win)
     {
     win = wxGetWindowFromTable(window);
     if (!win)
     {


@@ -478,25 +285,22 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         win = wxGetClientWindowFromTable(window);
         if (!win)
 #endif
         win = wxGetClientWindowFromTable(window);
         if (!win)
 #endif

-            return FALSE;
+            return false;

     }
 
     }
 

-#ifdef __WXDEBUG__
-    wxString windowClass = win->GetClassInfo()->GetClassName();
-#endif
-    
+

     switch (event->type)
     {
         case Expose:
         {
     switch (event->type)
     {
         case Expose:
         {

-#if wxUSE_TWO_WINDOWS
-            if (event->xexpose.window != (Window)win->GetClientWindow())
+#if wxUSE_TWO_WINDOWS && !wxUSE_NANOX
+            if (event->xexpose.window != (Window)win->GetClientAreaWindow())

             {
                 XEvent tmp_event;
                 wxExposeInfo info;
                 info.window = event->xexpose.window;
             {
                 XEvent tmp_event;
                 wxExposeInfo info;
                 info.window = event->xexpose.window;

-                info.found_non_matching = FALSE;
-                while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info ))
+                info.found_non_matching = false;
+                while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info ))

                 {
                     // Don't worry about optimizing redrawing the border etc.
                 }
                 {
                     // Don't worry about optimizing redrawing the border etc.
                 }


@@ -507,7 +311,6 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             {
                 win->GetUpdateRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
                                               XExposeEventGetWidth(event), XExposeEventGetHeight(event));
             {
                 win->GetUpdateRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
                                               XExposeEventGetWidth(event), XExposeEventGetHeight(event));

-                                              

                 win->GetClearRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
                                          XExposeEventGetWidth(event), XExposeEventGetHeight(event));
 
                 win->GetClearRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
                                          XExposeEventGetWidth(event), XExposeEventGetHeight(event));
 


@@ -515,69 +318,80 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                 XEvent tmp_event;
                 wxExposeInfo info;
                 info.window = event->xexpose.window;
                 XEvent tmp_event;
                 wxExposeInfo info;
                 info.window = event->xexpose.window;

-                info.found_non_matching = FALSE;
-                while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info ))
+                info.found_non_matching = false;
+                while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info ))

                 {
                     win->GetUpdateRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y,
                                                   tmp_event.xexpose.width, tmp_event.xexpose.height );
                 {
                     win->GetUpdateRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y,
                                                   tmp_event.xexpose.width, tmp_event.xexpose.height );

-                                              
+

                     win->GetClearRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y,
                                                  tmp_event.xexpose.width, tmp_event.xexpose.height );
                 }
 #endif
                     win->GetClearRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y,
                                                  tmp_event.xexpose.width, tmp_event.xexpose.height );
                 }
 #endif

-                if (win->GetMainWindow() == win->GetClientWindow())
+
+                // This simplifies the expose and clear areas to simple
+                // rectangles.
+                win->GetUpdateRegion() = win->GetUpdateRegion().GetBox();
+                win->GetClearRegion() = win->GetClearRegion().GetBox();
+
+                // If we only have one X11 window, always indicate
+                // that borders might have to be redrawn.
+                if (win->X11GetMainWindow() == win->GetClientAreaWindow())

                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.
                 win->SendEraseEvents();
                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.
                 win->SendEraseEvents();

+
+                // EXPERIMENT

                 //win->Update();
             }
 
                 //win->Update();
             }
 

-            return TRUE;
+            return true;

         }
         }

-        
+

 #if !wxUSE_NANOX
         case GraphicsExpose:
         {
 #if !wxUSE_NANOX
         case GraphicsExpose:
         {

-            // wxLogDebug( "GraphicsExpose from %s", win->GetName().c_str(),
-            //                              event->xgraphicsexpose.x, event->xgraphicsexpose.y,
-            //                              event->xgraphicsexpose.width, event->xgraphicsexpose.height);
-                    
+            wxLogTrace( wxT("expose"), wxT("GraphicsExpose from %s"), win->GetName().c_str());
+

             win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
                                           event->xgraphicsexpose.width, event->xgraphicsexpose.height);
             win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
                                           event->xgraphicsexpose.width, event->xgraphicsexpose.height);

-                                             
+

             win->GetClearRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
                                          event->xgraphicsexpose.width, event->xgraphicsexpose.height);
             win->GetClearRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
                                          event->xgraphicsexpose.width, event->xgraphicsexpose.height);

-                                              
+

             if (event->xgraphicsexpose.count == 0)
             {
                 // Only erase background, paint in idle time.
                 win->SendEraseEvents();
             if (event->xgraphicsexpose.count == 0)
             {
                 // Only erase background, paint in idle time.
                 win->SendEraseEvents();

-                //win->Update();
+                // win->Update();

             }
 
             }
 

-            return TRUE;
+            return true;

         }
 #endif
 
         case KeyPress:
         {
             if (!win->IsEnabled())
         }
 #endif
 
         case KeyPress:
         {
             if (!win->IsEnabled())

-                return FALSE;
+                return false;

 
             wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
             wxTranslateKeyEvent(keyEvent, win, window, event);
 
             wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
             wxTranslateKeyEvent(keyEvent, win, window, event);

-                    
+

             // wxLogDebug( "OnKey from %s", win->GetName().c_str() );
             // wxLogDebug( "OnKey from %s", win->GetName().c_str() );

-        
+

             // We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR
             // We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR

-            if (win->GetEventHandler()->ProcessEvent( keyEvent ))
-                return TRUE;
-                
+            if (win->HandleWindowEvent( keyEvent ))
+                return true;
+

             keyEvent.SetEventType(wxEVT_CHAR);
             keyEvent.SetEventType(wxEVT_CHAR);

-            if (win->GetEventHandler()->ProcessEvent( keyEvent ))
-                return TRUE;
-            
+            // Do the translation again, retaining the ASCII
+            // code.
+            if (wxTranslateKeyEvent(keyEvent, win, window, event, true) &&
+                win->HandleWindowEvent( keyEvent ))
+                return true;
+

             if ( (keyEvent.m_keyCode == WXK_TAB) &&
                  win->GetParent() && (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
             {
             if ( (keyEvent.m_keyCode == WXK_TAB) &&
                  win->GetParent() && (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
             {


@@ -588,20 +402,20 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
                 /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
                 new_event.SetWindowChange( keyEvent.ControlDown() );
                 new_event.SetCurrentFocus( win );
                 /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
                 new_event.SetWindowChange( keyEvent.ControlDown() );
                 new_event.SetCurrentFocus( win );

-                return win->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+                return win->GetParent()->HandleWindowEvent( new_event );

             }
 
             }
 

-            return FALSE;
+            return false;

         }
         case KeyRelease:
         {
             if (!win->IsEnabled())
         }
         case KeyRelease:
         {
             if (!win->IsEnabled())

-                return FALSE;
+                return false;

 
             wxKeyEvent keyEvent(wxEVT_KEY_UP);
             wxTranslateKeyEvent(keyEvent, win, window, event);
 
             wxKeyEvent keyEvent(wxEVT_KEY_UP);
             wxTranslateKeyEvent(keyEvent, win, window, event);

-        
-            return win->GetEventHandler()->ProcessEvent( keyEvent );
+
+            return win->HandleWindowEvent( keyEvent );

         }
         case ConfigureNotify:
         {
         }
         case ConfigureNotify:
         {


@@ -609,32 +423,35 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             if (event->update.utype == GR_UPDATE_SIZE)
 #endif
             {
             if (event->update.utype == GR_UPDATE_SIZE)
 #endif
             {

-                if (win->IsTopLevel() && win->IsShown())
+                wxTopLevelWindow *tlw = wxDynamicCast(win, wxTopLevelWindow);
+                if ( tlw )
+                {
+                    tlw->SetConfigureGeometry( XConfigureEventGetX(event), XConfigureEventGetY(event),
+                        XConfigureEventGetWidth(event), XConfigureEventGetHeight(event) );
+                }
+
+                if ( tlw && tlw->IsShown() )

                 {
                 {

-                    wxTopLevelWindowX11 *tlw = (wxTopLevelWindowX11 *) win;

                     tlw->SetNeedResizeInIdle();
                 }
                 else
                 {
                     wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
                     sizeEvent.SetEventObject( win );
                     tlw->SetNeedResizeInIdle();
                 }
                 else
                 {
                     wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
                     sizeEvent.SetEventObject( win );

-                
-                    return win->GetEventHandler()->ProcessEvent( sizeEvent );
+
+                    return win->HandleWindowEvent( sizeEvent );

                 }
             }
                 }
             }

-            return FALSE;
-            break;
+            return false;

         }
 #if !wxUSE_NANOX
         case PropertyNotify:
         }
 #if !wxUSE_NANOX
         case PropertyNotify:

-        {
-            //wxLogDebug("PropertyNotify: %s", windowClass.c_str());

             return HandlePropertyChange(_event);
             return HandlePropertyChange(_event);

-        }
+

         case ClientMessage:
         {
             if (!win->IsEnabled())
         case ClientMessage:
         {
             if (!win->IsEnabled())

-                return FALSE;
+                return false;

 
             Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);
             Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);
 
             Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);
             Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);


@@ -643,11 +460,11 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
             {
                 if ((Atom) (event->xclient.data.l[0]) == wm_delete_window)
                 {
             {
                 if ((Atom) (event->xclient.data.l[0]) == wm_delete_window)
                 {

-                    win->Close(FALSE);
-                    return TRUE;
+                    win->Close(false);
+                    return true;

                 }
             }
                 }
             }

-            return FALSE;
+            return false;

         }
 #if 0
         case DestroyNotify:
         }
 #if 0
         case DestroyNotify:


@@ -668,19 +485,19 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         case ResizeRequest:
         {
             printf( "resize request from %s\n", win->GetName().c_str() );
         case ResizeRequest:
         {
             printf( "resize request from %s\n", win->GetName().c_str() );

-            
+

             Display *disp = (Display*) wxGetDisplay();
             XEvent report;
             Display *disp = (Display*) wxGetDisplay();
             XEvent report;

-            
+

             //  to avoid flicker
             report = * event;
             while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));
             //  to avoid flicker
             report = * event;
             while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));

-            
+

             wxSize sz = win->GetSize();
             wxSizeEvent sizeEvent(sz, win->GetId());
             sizeEvent.SetEventObject(win);
 
             wxSize sz = win->GetSize();
             wxSizeEvent sizeEvent(sz, win->GetId());
             sizeEvent.SetEventObject(win);
 

-            return win->GetEventHandler()->ProcessEvent( sizeEvent );
+            return win->HandleWindowEvent( sizeEvent );

         }
 #endif
 #endif
         }
 #endif
 #endif


@@ -689,10 +506,10 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         {
             if (win)
             {
         {
             if (win)
             {

-                win->Close(FALSE);
-                return TRUE;
+                win->Close(false);
+                return true;

             }
             }

-            return FALSE;
+            return false;

             break;
         }
 #endif
             break;
         }
 #endif


@@ -703,245 +520,184 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         case MotionNotify:
         {
             if (!win->IsEnabled())
         case MotionNotify:
         {
             if (!win->IsEnabled())

-                return FALSE;
-                
+                return false;
+

             // Here we check if the top level window is
             // disabled, which is one aspect of modality.
             wxWindow *tlw = win;
             while (tlw && !tlw->IsTopLevel())
                 tlw = tlw->GetParent();
             if (tlw && !tlw->IsEnabled())
             // Here we check if the top level window is
             // disabled, which is one aspect of modality.
             wxWindow *tlw = win;
             while (tlw && !tlw->IsTopLevel())
                 tlw = tlw->GetParent();
             if (tlw && !tlw->IsEnabled())

-                return FALSE;
-                
+                return false;
+

             if (event->type == ButtonPress)
             {
             if (event->type == ButtonPress)
             {

-                if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
+                if ((win != wxWindow::FindFocus()) && win->CanAcceptFocus())

                 {
                     // This might actually be done in wxWindow::SetFocus()
                     // and not here. TODO.
                     g_prevFocus = wxWindow::FindFocus();
                     g_nextFocus = win;
                 {
                     // This might actually be done in wxWindow::SetFocus()
                     // and not here. TODO.
                     g_prevFocus = wxWindow::FindFocus();
                     g_nextFocus = win;

-                    
+
+                    wxLogTrace( wxT("focus"), wxT("About to call SetFocus on %s of type %s due to button press"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+
+                    // Record the fact that this window is
+                    // getting the focus, because we'll need to
+                    // check if its parent is getting a bogus
+                    // focus and duly ignore it.
+                    // TODO: may need to have this code in SetFocus, too.
+                    extern wxWindow* g_GettingFocus;
+                    g_GettingFocus = win;

                     win->SetFocus();
                 }
             }
                     win->SetFocus();
                 }
             }

-            
+

 #if !wxUSE_NANOX
             if (event->type == LeaveNotify || event->type == EnterNotify)
             {
                 // Throw out NotifyGrab and NotifyUngrab
                 if (event->xcrossing.mode != NotifyNormal)
 #if !wxUSE_NANOX
             if (event->type == LeaveNotify || event->type == EnterNotify)
             {
                 // Throw out NotifyGrab and NotifyUngrab
                 if (event->xcrossing.mode != NotifyNormal)

-                    return FALSE;
+                    return false;

             }
 #endif
             wxMouseEvent wxevent;
             wxTranslateMouseEvent(wxevent, win, window, event);
             }
 #endif
             wxMouseEvent wxevent;
             wxTranslateMouseEvent(wxevent, win, window, event);

-            return win->GetEventHandler()->ProcessEvent( wxevent );
+            return win->HandleWindowEvent( wxevent );

         }
         case FocusIn:
         }
         case FocusIn:

-            {

 #if !wxUSE_NANOX
 #if !wxUSE_NANOX

-                if ((event->xfocus.detail != NotifyPointer) &&
-                    (event->xfocus.mode == NotifyNormal))
+            if ((event->xfocus.detail != NotifyPointer) &&
+                (event->xfocus.mode == NotifyNormal))

 #endif
 #endif

+            {
+                wxLogTrace( wxT("focus"), wxT("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+
+                extern wxWindow* g_GettingFocus;
+                if (g_GettingFocus && g_GettingFocus->GetParent() == win)
+                {
+                    // Ignore this, this can be a spurious FocusIn
+                    // caused by a child having its focus set.
+                    g_GettingFocus = NULL;
+                    wxLogTrace( wxT("focus"), wxT("FocusIn from %s of type %s being deliberately ignored"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+                    return true;
+                }
+                else

                 {
                 {

-                    // wxLogDebug( "FocusIn from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
-                    

                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     focusEvent.SetWindow( g_prevFocus );
                     g_prevFocus = NULL;
                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     focusEvent.SetWindow( g_prevFocus );
                     g_prevFocus = NULL;

-                    
-                    return win->GetEventHandler()->ProcessEvent(focusEvent);
+
+                    return win->HandleWindowEvent(focusEvent);

                 }
                 }

-                return FALSE;
-                break;

             }
             }

+            return false;
+

         case FocusOut:
         case FocusOut:

-            {

 #if !wxUSE_NANOX
 #if !wxUSE_NANOX

-                if ((event->xfocus.detail != NotifyPointer) &&
-                    (event->xfocus.mode == NotifyNormal))
+            if ((event->xfocus.detail != NotifyPointer) &&
+                (event->xfocus.mode == NotifyNormal))

 #endif
 #endif

-                {
-                    // wxLogDebug( "FocusOut from %s of type %s", win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
-                    
-                    wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
-                    focusEvent.SetEventObject(win);
-                    focusEvent.SetWindow( g_nextFocus );
-                    g_nextFocus = NULL;
-                    return win->GetEventHandler()->ProcessEvent(focusEvent);
-                }
-                return FALSE;
-                break;
+            {
+                wxLogTrace( wxT("focus"), wxT("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+
+                wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
+                focusEvent.SetEventObject(win);
+                focusEvent.SetWindow( g_nextFocus );
+                g_nextFocus = NULL;
+                return win->HandleWindowEvent(focusEvent);

             }
             }

-        default:
-        {
-#ifdef __WXDEBUG__
-            //wxString eventName = wxGetXEventName(XEvent& event);
-            //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
-#endif
-            return FALSE;
-            break;
-        }
+            return false;

     }
     }

-    return FALSE;
-}
-
-// Returns TRUE if more time is needed.
-// Note that this duplicates wxEventLoopImpl::SendIdleEvent
-// but ProcessIdle may be needed by apps, so is kept.
-bool wxApp::ProcessIdle()
-{
-    wxIdleEvent event;
-    event.SetEventObject(this);
-    ProcessEvent(event);
-
-    return event.MoreRequested();
-}
-
-void wxApp::ExitMainLoop()
-{
-    if (m_mainLoop)
-        m_mainLoop->Exit(0);
-}
-
-// Is a message/event pending?
-bool wxApp::Pending()
-{
-    return wxEventLoop::GetActive()->Pending();
-}

 
 

-// Dispatch a message.
-void wxApp::Dispatch()
-{
-    wxEventLoop::GetActive()->Dispatch();
+    return false;

 }
 
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
 }
 
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.

-bool wxApp::HandlePropertyChange(WXEvent *event)
+bool wxApp::HandlePropertyChange(WXEvent *WXUNUSED(event))

 {
     // by default do nothing special
     // TODO: what to do for X11
     // XtDispatchEvent((XEvent*) event);
 {
     // by default do nothing special
     // TODO: what to do for X11
     // XtDispatchEvent((XEvent*) event);

-    return FALSE;
+    return false;

 }
 
 }
 

-void wxApp::OnIdle(wxIdleEvent& event)
+void wxApp::WakeUpIdle()

 {
 {

-    static bool s_inOnIdle = FALSE;
-
-    // Avoid recursion (via ProcessEvent default case)
-    if (s_inOnIdle)
-        return;
-
-    s_inOnIdle = TRUE;
-
-    // Resend in the main thread events which have been prepared in other
-    // threads
-    ProcessPendingEvents();
-
-    // 'Garbage' collection of windows deleted with Close()
-    DeletePendingObjects();
-
-    // Send OnIdle events to all windows
-    bool needMore = SendIdleEvents();
-
-    if (needMore)
-        event.RequestMore(TRUE);
+    // TODO: use wxMotif implementation?

 
 

-    s_inOnIdle = FALSE;
-}
-
-void wxWakeUpIdle()
-{
-    // **** please implement me! ****

     // Wake up the idle handler processor, even if it is in another thread...
 }
 
 
     // Wake up the idle handler processor, even if it is in another thread...
 }
 
 

-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
+// Create display, and other initialization
+bool wxApp::OnInitGui()

 {
 {

-    bool needMore = FALSE;
-
-    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
-    while (node)
-    {
-        wxWindow* win = node->GetData();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
-        node = node->GetNext();
-    }
-
-    return needMore;
-}
+#if wxUSE_LOG
+    // Eventually this line will be removed, but for
+    // now we don't want to try popping up a dialog
+    // for error messages.
+    delete wxLog::SetActiveTarget(new wxLogStderr);
+#endif

 
 

-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
-    bool needMore = FALSE;
+    if (!wxAppBase::OnInitGui())
+        return false;

 
 

-    wxIdleEvent event;
-    event.SetEventObject(win);
+    Display *dpy = wxGlobalDisplay();
+    GetMainColormap(dpy);

 
 

-    win->GetEventHandler()->ProcessEvent(event);
+    m_maxRequestSize = XMaxRequestSize(dpy);

 
 

-    win->OnInternalIdle();
+#if !wxUSE_NANOX
+    m_visualInfo = new wxXVisualInfo;
+    wxFillXVisualInfo(m_visualInfo, dpy);
+#endif

 
 

-    if (event.MoreRequested())
-        needMore = TRUE;
+    return true;
+}

 
 

-    wxNode* node = win->GetChildren().First();
-    while (node)
-    {
-        wxWindow* win = (wxWindow*) node->Data();
-        if (SendIdleEvents(win))
-            needMore = TRUE;
+#if wxUSE_UNICODE

 
 

-        node = node->Next();
-    }
-    
-    return needMore;
-}
+#include <pango/pango.h>
+#include <pango/pangox.h>
+#ifdef HAVE_PANGO_XFT
+    #include <pango/pangoxft.h>
+#endif

 
 

-void wxApp::DeletePendingObjects()
+PangoContext* wxApp::GetPangoContext()

 {
 {

-    wxNode *node = wxPendingDelete.First();
-    while (node)
+    static PangoContext *s_pangoContext = NULL;
+    if ( !s_pangoContext )

     {
     {

-        wxObject *obj = (wxObject *)node->Data();
+        Display *dpy = wxGlobalDisplay();

 
 

-        delete obj;
+#ifdef HAVE_PANGO_XFT
+        int xscreen = DefaultScreen(dpy);
+        static int use_xft = -1;
+        if (use_xft == -1)
+        {
+            wxString val = wxGetenv( L"GDK_USE_XFT" );
+            use_xft = val == L"1";
+        }

 
 

-        if (wxPendingDelete.Member(obj))
-            delete node;
+        if (use_xft)
+            s_pangoContext = pango_xft_get_context(dpy, xscreen);
+        else
+#endif // HAVE_PANGO_XFT
+            s_pangoContext = pango_x_get_context(dpy);

 
 

-        // Deleting one object may have deleted other pending
-        // objects, so start from beginning of list again.
-        node = wxPendingDelete.First();
+        if (!PANGO_IS_CONTEXT(s_pangoContext))
+        {
+            wxLogError( wxT("No pango context.") );
+        }

     }
     }

-}
-
-// Create display, and other initialization
-bool wxApp::OnInitGui()
-{
-    // Eventually this line will be removed, but for
-    // now we don't want to try popping up a dialog
-    // for error messages.
-    delete wxLog::SetActiveTarget(new wxLogStderr);
-    
-    if (!wxAppBase::OnInitGui())
-    return FALSE;
-    
-    GetMainColormap( wxApp::GetDisplay() );

 
 

-    m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
-
-    return TRUE;
+    return s_pangoContext;

 }
 
 }
 

+#endif // wxUSE_UNICODE
+

 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
     if (!display) /* Must be called first with non-NULL display */
 WXColormap wxApp::GetMainColormap(WXDisplay* display)
 {
     if (!display) /* Must be called first with non-NULL display */


@@ -960,11 +716,13 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
 
 Window wxGetWindowParent(Window window)
 {
 
 Window wxGetWindowParent(Window window)
 {

-    wxASSERT_MSG( window, "invalid window" );
-    
+    wxASSERT_MSG( window, wxT("invalid window") );
+

     return (Window) 0;
 
     return (Window) 0;
 

-    Window parent, root = 0;
+#ifndef __VMS
+   // VMS chokes on unreacheable code
+   Window parent, root = 0;

 #if wxUSE_NANOX
     int noChildren = 0;
 #else
 #if wxUSE_NANOX
     int noChildren = 0;
 #else


@@ -985,79 +743,13 @@ Window wxGetWindowParent(Window window)
         return parent;
     else
         return (Window) 0;
         return parent;
     else
         return (Window) 0;

+#endif

 }
 
 }
 

-void wxExit()
+void wxApp::Exit()

 {
 {

-    int retValue = 0;
-    if (wxTheApp)
-        retValue = wxTheApp->OnExit();
-

     wxApp::CleanUp();
     wxApp::CleanUp();

-    /*
-    * Exit in some platform-specific way. Not recommended that the app calls this:
-    * only for emergencies.
-    */
-    exit(retValue);
-}
-
-// Yield to other processes
-
-bool wxApp::Yield(bool onlyIfNeeded)
-{
-    bool s_inYield = FALSE;
-
-    if ( s_inYield )
-    {
-        if ( !onlyIfNeeded )
-        {
-            wxFAIL_MSG( wxT("wxYield called recursively" ) );
-        }
-
-        return FALSE;
-    }
-
-    s_inYield = TRUE;

 
 

-    // Make sure we have an event loop object,
-    // or Pending/Dispatch will fail
-    wxEventLoop* eventLoop = wxEventLoop::GetActive();
-    wxEventLoop* newEventLoop = NULL;
-    if (!eventLoop)
-    {
-        newEventLoop = new wxEventLoop;
-        wxEventLoop::SetActive(newEventLoop);
-    }
-
-    while (wxTheApp && wxTheApp->Pending())
-        wxTheApp->Dispatch();
-
-#if wxUSE_TIMER
-    wxTimer::NotifyTimers();
-#endif
-    ProcessIdle();
-
-    if (newEventLoop)
-    {
-        wxEventLoop::SetActive(NULL);
-        delete newEventLoop;
-    }
-
-    s_inYield = FALSE;
-
-    return TRUE;
-}
-
-void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
-{
-    // While the GUI isn't working that well, just print out the
-    // message.
-#if 0    
-    wxAppBase::OnAssert(file, line, msg);
-#else
-    wxString msg2;
-    msg2.Printf("At file %s:%d: %s", file, line, msg);
-    wxLogDebug(msg2);
-#endif
+    wxAppConsole::Exit();

 }
 
 }