Had missed one LPSTR.

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 7b938e76671dc60dbb27fae6c25ad7d987baa4b9..1dd8ad95af0b4dd9dbd6dae0139849a3eaa39597 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -8,7 +8,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "app.h"
+    #pragma implementation "app.h"

 #endif
 
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"


@@ -20,19 +20,24 @@
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/dialog.h"
 #include "wx/font.h"
 #include "wx/settings.h"
 #include "wx/dialog.h"

+

 #if wxUSE_WX_RESOURCES
 #if wxUSE_WX_RESOURCES

-#include "wx/resource.h"
+    #include "wx/resource.h"

 #endif
 #endif

+

 #include "wx/module.h"
 #include "wx/image.h"
 #include "wx/module.h"
 #include "wx/image.h"

+

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

+

 #include "unistd.h"
 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 #include "unistd.h"
 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"

+

 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------


@@ -42,8 +47,12 @@
 wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 
 wxApp *wxTheApp = (wxApp *)  NULL;
 wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
 

-extern wxList wxPendingDelete;
+#if wxUSE_THREADS
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;
+#endif

 extern wxResourceCache *wxTheResourceCache;
 extern wxResourceCache *wxTheResourceCache;

+extern bool g_isIdle;

 
 unsigned char g_palette[64*3] =
 {
 
 unsigned char g_palette[64*3] =
 {


@@ -123,55 +132,165 @@ extern void wxFlushResources(void);
 // global functions
 //-----------------------------------------------------------------------------
 
 // global functions
 //-----------------------------------------------------------------------------
 

-void wxExit(void)
+void wxExit()

 {
     gtk_main_quit();
 }
 
 {
     gtk_main_quit();
 }
 

-bool wxYield(void)
+/* forward declaration */
+gint wxapp_idle_callback( gpointer WXUNUSED(data) );
+
+bool wxYield()

 {
 {

-    while (gtk_events_pending() > 0) gtk_main_iteration();
-    return TRUE;
-}
+    /* it's necessary to call ProcessIdle() to update the frames sizes which
+       might have been changed (it also will update other things set from
+       OnUpdateUI() which is a nice (and desired) side effect) */
+    while (wxTheApp->ProcessIdle()) { }
+       
+#if 0
+    for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();
+        win->OnInternalIdle();
+    }
+#endif

 
 

-//-----------------------------------------------------------------------------
-// wxApp
-//-----------------------------------------------------------------------------
+    if (wxTheApp->m_idleTag)
+    {
+        /* We need to temporarily remove idle callbacks or the loop will
+           never finish. */
+        gtk_idle_remove( wxTheApp->m_idleTag );
+        wxTheApp->m_idleTag = 0;

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler)
+        while (gtk_events_pending())
+            gtk_main_iteration();

 
 

-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-    EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
+        /* re-add idle handler */
+        wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
+    }
+    else
+    {
+        while (gtk_events_pending())
+            gtk_main_iteration();
+    }
+    
+    return TRUE;
+}

 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {

-    if (wxTheApp) while (wxTheApp->ProcessIdle()) {}
-#if wxUSE_THREADS
-    wxMutexGuiLeave();
+    if (!wxTheApp) return TRUE;
+    
+#if (GTK_MINOR_VERSION > 0)
+    /* when getting called from GDK's idle handler we
+       are no longer within GDK's grab on the GUI
+       thread so we must lock it here ourselves */
+    GDK_THREADS_ENTER ();
+#endif
+    
+    /* sent idle event to all who request them */
+    while (wxTheApp->ProcessIdle()) { }
+    
+    /* we don't want any more idle events until the next event is
+       sent to wxGTK */
+    gtk_idle_remove( wxTheApp->m_idleTag );
+    wxTheApp->m_idleTag = 0;
+
+    /* indicate that we are now in idle mode - even so deeply
+       in idle mode that we don't get any idle events anymore.
+       this is like wxMSW where an idle event is sent only
+       once each time after the event queue has been completely
+       emptied */
+    g_isIdle = TRUE;
+    
+#if (GTK_MINOR_VERSION > 0)
+    /* release lock again */
+    GDK_THREADS_LEAVE ();

 #endif
 #endif

-    usleep(10000);
+
+    return TRUE;
+}
+
+void wxapp_install_idle_handler()
+{
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") );
+
+    /* this routine gets called by all event handlers
+       indicating that the idle is over. */
+
+    wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
+    
+    g_isIdle = FALSE;
+}
+

 #if wxUSE_THREADS
 #if wxUSE_THREADS

+static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+{
+    gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
+    wxTheApp->m_wakeUpTimerTag = 0;
+    
+#if (GTK_MINOR_VERSION > 0)
+    /* when getting called from GDK's time-out handler 
+       we are no longer within GDK's grab on the GUI
+       thread so we must lock it here ourselves */
+    GDK_THREADS_ENTER ();
+#endif
+    
+    /* unblock other threads wishing to do some GUI things */
+    wxMutexGuiLeave();
+    
+    /* wake up other threads */
+    wxUsleep( 1 );
+    
+    /* block other thread again  */

     wxMutexGuiEnter();
     wxMutexGuiEnter();

+    
+#if (GTK_MINOR_VERSION > 0)
+    /* release lock again */
+    GDK_THREADS_LEAVE ();

 #endif
 #endif

+    
+    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+    

     return TRUE;
 }
     return TRUE;
 }

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

 
 wxApp::wxApp()
 {
     wxTheApp = this;
 
 wxApp::wxApp()
 {
     wxTheApp = this;

-    
+

     m_topWindow = (wxWindow *) NULL;
     m_exitOnFrameDelete = TRUE;
     m_topWindow = (wxWindow *) NULL;
     m_exitOnFrameDelete = TRUE;

-    
+

     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     

+#if wxUSE_THREADS
+    m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+#endif
+

     m_colorCube = (unsigned char*) NULL;
 }
 
     m_colorCube = (unsigned char*) NULL;
 }
 

-wxApp::~wxApp(void)
+wxApp::~wxApp()

 {
 {

-    gtk_idle_remove( m_idleTag );
+    if (m_idleTag) gtk_idle_remove( m_idleTag );
+
+#if wxUSE_THREADS
+    if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag );
+#endif

     
     if (m_colorCube) free(m_colorCube);
 }
     
     if (m_colorCube) free(m_colorCube);
 }


@@ -182,13 +301,13 @@ bool wxApp::OnInitGui()
 
     GdkVisual *visual = gdk_visual_get_system();
     if (visual->depth > 8) return TRUE;
 
     GdkVisual *visual = gdk_visual_get_system();
     if (visual->depth > 8) return TRUE;

-    
+

         /* this initiates the standard palette as defined by GdkImlib
            in the GNOME libraries. it ensures that all GNOME applications
            use the same 64 colormap entries on 8-bit displays so you
            can use several rather graphics-heavy applications at the
            same time.
         /* this initiates the standard palette as defined by GdkImlib
            in the GNOME libraries. it ensures that all GNOME applications
            use the same 64 colormap entries on 8-bit displays so you
            can use several rather graphics-heavy applications at the
            same time.

-          NOTE: this doesn't really seem to work this way... */
+           NOTE: this doesn't really seem to work this way... */

 
         /*
         GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );
 
         /*
         GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE );


@@ -203,49 +322,64 @@ bool wxApp::OnInitGui()
 
             gdk_color_alloc( cmap, &col );
         }
 
             gdk_color_alloc( cmap, &col );
         }

-       
+

         gtk_widget_set_default_colormap( cmap );
         */
         gtk_widget_set_default_colormap( cmap );
         */

-    
+

     /* initialize color cube for 8-bit color reduction dithering */
     /* initialize color cube for 8-bit color reduction dithering */

-    
+

     GdkColormap *cmap = gtk_widget_get_default_colormap();
     GdkColormap *cmap = gtk_widget_get_default_colormap();

-    
+

     m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
 
     m_colorCube = (unsigned char*)malloc(32 * 32 * 32);
 

-     for (int r = 0; r < 32; r++)
-     {
-       for (int g = 0; g < 32; g++)
-       {
-           for (int b = 0; b < 32; b++)
-           {
-               int rr = (r << 3) | (r >> 2);
-               int gg = (g << 3) | (g >> 2);
-               int bb = (b << 3) | (b >> 2);
-               
-                GdkColor *colors = cmap->colors;
-                int max = 3 * (65536);
+    for (int r = 0; r < 32; r++)
+    {
+        for (int g = 0; g < 32; g++)
+        {
+            for (int b = 0; b < 32; b++)
+            {
+                int rr = (r << 3) | (r >> 2);
+                int gg = (g << 3) | (g >> 2);
+                int bb = (b << 3) | (b >> 2);
+

                 int index = -1;
 
                 int index = -1;
 

-                for (int i = 0; i < cmap->size; i++)
+                GdkColor *colors = cmap->colors;
+                if (colors)

                 {
                 {

-                    int rdiff = ((rr << 8) - colors[i].red);
-                    int gdiff = ((gg << 8)- colors[i].green);
-                    int bdiff = ((bb << 8)- colors[i].blue);
-                    int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
-                    if (sum < max) { index = i; max = sum; }
+                    int max = 3 * 65536;
+
+                    for (int i = 0; i < cmap->size; i++)
+                    {
+                        int rdiff = ((rr << 8) - colors[i].red);
+                        int gdiff = ((gg << 8) - colors[i].green);
+                        int bdiff = ((bb << 8) - colors[i].blue);
+                        int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+                        if (sum < max)
+                        { 
+                            index = i; max = sum;
+                        }
+                    }

                 }
                 }

+               else
+               {
+                   /* assume 8-bit true or static colors. this really
+                      exists. */
+                   GdkVisual* vis = gdk_colormap_get_visual( cmap );
+                   index = (r >> (5 - vis->red_prec)) << vis->red_shift;
+                   index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
+                   index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
+               }

                
                

-               m_colorCube[ (r*1024) + (g*32) + b ] = index;
-           }
-       }
+                m_colorCube[ (r*1024) + (g*32) + b ] = index;
+            }
+        }

     }
 
     }
 

-    

     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxApp::ProcessIdle(void)
+bool wxApp::ProcessIdle()

 {
     wxIdleEvent event;
     event.SetEventObject( this );
 {
     wxIdleEvent event;
     event.SetEventObject( this );


@@ -264,13 +398,21 @@ void wxApp::OnIdle( wxIdleEvent &event )
 
     inOnIdle = TRUE;
 
 
     inOnIdle = TRUE;
 

+#if wxUSE_THREADS
+    /* Resend in the main thread events which have been prepared in other
+       threads */
+    ProcessPendingEvents();
+#endif
+

     /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();
 
     /* flush the logged messages if any */
     /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();
 
     /* flush the logged messages if any */

+#if wxUSE_LOG

     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
         log->Flush();
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
         log->Flush();

+#endif // wxUSE_LOG

 
     /* Send OnIdle events to all windows */
     bool needMore = SendIdleEvents();
 
     /* Send OnIdle events to all windows */
     bool needMore = SendIdleEvents();


@@ -281,18 +423,19 @@ void wxApp::OnIdle( wxIdleEvent &event )
     inOnIdle = FALSE;
 }
 
     inOnIdle = FALSE;
 }
 

-bool wxApp::SendIdleEvents(void)
+bool wxApp::SendIdleEvents()

 {
     bool needMore = FALSE;
 
 {
     bool needMore = FALSE;
 

-    wxNode* node = wxTopLevelWindows.First();
+    wxWindowList::Node* node = wxTopLevelWindows.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxWindow* win = (wxWindow*) node->Data();
+        wxWindow* win = node->GetData();

         if (SendIdleEvents(win))
             needMore = TRUE;
         if (SendIdleEvents(win))
             needMore = TRUE;

-        node = node->Next();
+        node = node->GetNext();

     }
     }

+

     return needMore;
 }
 
     return needMore;
 }
 


@@ -302,6 +445,9 @@ bool wxApp::SendIdleEvents( wxWindow* win )
 
     wxIdleEvent event;
     event.SetEventObject(win);
 
     wxIdleEvent event;
     event.SetEventObject(win);

+
+    win->OnInternalIdle();
+

     win->ProcessEvent(event);
 
     if (event.MoreRequested())
     win->ProcessEvent(event);
 
     if (event.MoreRequested())


@@ -319,32 +465,52 @@ bool wxApp::SendIdleEvents( wxWindow* win )
     return needMore ;
 }
 
     return needMore ;
 }
 

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

 {
     gtk_main();
     return 0;
 }
 
 {
     gtk_main();
     return 0;
 }
 

-void wxApp::ExitMainLoop(void)
+void wxApp::ExitMainLoop()

 {
     gtk_main_quit();
 }
 
 {
     gtk_main_quit();
 }
 

-bool wxApp::Initialized(void)
+bool wxApp::Initialized()

 {
     return m_initialized;
 }
 
 {
     return m_initialized;
 }
 

-bool wxApp::Pending(void)
+bool wxApp::Pending()

 {
 {

-    return FALSE;
+    return (gtk_events_pending() > 0);

 }
 
 }
 

-void wxApp::Dispatch(void)
+void wxApp::Dispatch()

 {
 {

+    gtk_main_iteration();

 }
 
 }
 

-void wxApp::DeletePendingObjects(void)
+#if wxUSE_THREADS
+void wxApp::ProcessPendingEvents()
+{
+    wxNode *node = wxPendingEvents->First();
+    wxCriticalSectionLocker locker(*wxPendingEventsLocker);
+
+    while (node)
+    {
+        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
+
+        handler->ProcessPendingEvents();
+
+        delete node;
+
+        node = wxPendingEvents->First();
+    }
+}
+#endif // wxUSE_THREADS
+
+void wxApp::DeletePendingObjects()

 {
     wxNode *node = wxPendingDelete.First();
     while (node)
 {
     wxNode *node = wxPendingDelete.First();
     while (node)


@@ -353,19 +519,21 @@ void wxApp::DeletePendingObjects(void)
 
         delete obj;
 
 
         delete obj;
 

-        if (wxPendingDelete.Member(obj))
-        delete node;
+        if (wxPendingDelete.Find(obj))
+            delete node;

 
         node = wxPendingDelete.First();
     }
 }
 
 
         node = wxPendingDelete.First();
     }
 }
 

-wxWindow *wxApp::GetTopWindow(void)
+wxWindow *wxApp::GetTopWindow()

 {
 {

-    if (m_topWindow) return m_topWindow;
-    wxNode *node = wxTopLevelWindows.First();
-    if (!node) return (wxWindow *) NULL;
-    return (wxWindow*)node->Data();
+    if (m_topWindow)
+        return m_topWindow;
+    else if (wxTopLevelWindows.GetCount() > 0)
+        return wxTopLevelWindows.GetFirst()->GetData();
+    else
+        return NULL;

 }
 
 void wxApp::SetTopWindow( wxWindow *win )
 }
 
 void wxApp::SetTopWindow( wxWindow *win )


@@ -373,16 +541,25 @@ void wxApp::SetTopWindow( wxWindow *win )
     m_topWindow = win;
 }
 
     m_topWindow = win;
 }
 

-bool wxApp::Initialize(void)
+bool wxApp::Initialize()

 {
 {

-    wxBuffer = new char[BUFSIZ + 512];
+    wxBuffer = new wxChar[BUFSIZ + 512];

 
     wxClassInfo::InitializeClasses();
 
     wxClassInfo::InitializeClasses();

-    
+

     wxSystemSettings::Init();
     wxSystemSettings::Init();

-  
+
+    // 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
+    wxPendingEvents = new wxList();
+    wxPendingEventsLocker = new wxCriticalSection();
+#endif
+
+/*

     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();
     wxTheFontNameDirectory =  new wxFontNameDirectory;
     wxTheFontNameDirectory->Initialize();

+*/

 
     wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
     wxTheColourDatabase->Initialize();
 
     wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING );
     wxTheColourDatabase->Initialize();


@@ -392,7 +569,7 @@ bool wxApp::Initialize(void)
 
 #if wxUSE_WX_RESOURCES
     wxTheResourceCache = new wxResourceCache( wxKEY_STRING );
 
 #if wxUSE_WX_RESOURCES
     wxTheResourceCache = new wxResourceCache( wxKEY_STRING );

-  
+

     wxInitializeResourceSystem();
 #endif
 
     wxInitializeResourceSystem();
 #endif
 


@@ -400,32 +577,36 @@ bool wxApp::Initialize(void)
 
     /* no global cursor under X
        g_globalCursor = new wxCursor; */
 
     /* no global cursor under X
        g_globalCursor = new wxCursor; */

-       
+

     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-void wxApp::CleanUp(void)
+void wxApp::CleanUp()

 {
     wxModule::CleanUpModules();
 
 #if wxUSE_WX_RESOURCES
     wxFlushResources();
 
 {
     wxModule::CleanUpModules();
 
 #if wxUSE_WX_RESOURCES
     wxFlushResources();
 

-    if (wxTheResourceCache) delete wxTheResourceCache;
+    if (wxTheResourceCache)
+        delete wxTheResourceCache;

     wxTheResourceCache = (wxResourceCache*) NULL;
     wxTheResourceCache = (wxResourceCache*) NULL;

-    
+

     wxCleanUpResourceSystem();
 #endif
 
     wxCleanUpResourceSystem();
 #endif
 

-    if (wxTheColourDatabase) delete wxTheColourDatabase;
+    if (wxTheColourDatabase)
+        delete wxTheColourDatabase;

     wxTheColourDatabase = (wxColourDatabase*) NULL;
     wxTheColourDatabase = (wxColourDatabase*) NULL;

-    
+
+/*

     if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
     wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;
     if (wxTheFontNameDirectory) delete wxTheFontNameDirectory;
     wxTheFontNameDirectory = (wxFontNameDirectory*) NULL;

-    
+*/
+

     wxDeleteStockObjects();
 
     wxDeleteStockLists();
     wxDeleteStockObjects();
 
     wxDeleteStockLists();


@@ -435,33 +616,43 @@ void wxApp::CleanUp(void)
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 

-    /* check for memory leaks */
+    // 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
+
+    wxSystemSettings::Done();
+
+    delete[] wxBuffer;
+
+    wxClassInfo::CleanUpClasses();
+
+    // check for memory leaks

 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {

-        wxLogDebug("There were memory leaks.\n");
+        wxLogDebug(_T("There were memory leaks.\n"));

         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }

-#endif
+#endif // Debug

 
 

-    /* do this as the very last thing because everything else can log messages */
+#if wxUSE_LOG
+    // do this as the very last thing because everything else can log messages

     wxLog::DontCreateOnDemand();
     wxLog::DontCreateOnDemand();

-    
-    wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
-    if (oldLog) delete oldLog;

 
 

-    wxSystemSettings::Done();
-    
-    wxClassInfo::CleanUpClasses();
-
-    delete[] wxBuffer;
+    wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
+    if (oldLog)
+        delete oldLog;

 }
 
 wxLog *wxApp::CreateLogTarget()
 {
     return new wxLogGui;
 }
 }
 
 wxLog *wxApp::CreateLogTarget()
 {
     return new wxLogGui;
 }

+#endif // wxUSE_LOG

 
 //-----------------------------------------------------------------------------
 // wxEntry
 
 //-----------------------------------------------------------------------------
 // wxEntry


@@ -471,17 +662,19 @@ int wxEntry( int argc, char *argv[] )
 {
     gtk_set_locale();
 
 {
     gtk_set_locale();
 

+    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+

     gtk_init( &argc, &argv );
 
     gtk_init( &argc, &argv );
 

-    if (!wxApp::Initialize()) return 0;
+    wxSetDetectableAutoRepeat( TRUE );
+    
+    if (!wxApp::Initialize())
+        return -1;

 
     if (!wxTheApp)
     {
 
     if (!wxTheApp)
     {

-        if (!wxApp::GetInitializerFunction())
-        {
-            printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
-            return 0;
-        }
+        wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
+                     _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );

 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 
 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 


@@ -490,59 +683,75 @@ int wxEntry( int argc, char *argv[] )
         wxTheApp = (wxApp*) test_app;
     }
 
         wxTheApp = (wxApp*) test_app;
     }
 

-    if (!wxTheApp)
-    {
-        printf( "wxWindows error: wxTheApp == NULL\n" );
-        return 0;
-    }
+    wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );

 
     wxTheApp->argc = argc;
     wxTheApp->argv = argv;
 
 
     wxTheApp->argc = argc;
     wxTheApp->argv = argv;
 

-    char name[200];
-    strcpy( name, argv[0] );
-    strcpy( name, wxFileNameFromPath(name) );
+    wxString name(wxFileNameFromPath(argv[0]));

     wxStripExtension( name );
     wxTheApp->SetAppName( name );
 
     wxStripExtension( name );
     wxTheApp->SetAppName( name );
 

-    if (!wxTheApp->OnInitGui()) return 0;
-
-    /* Here frames insert themselves automatically
-     * into wxTopLevelWindows by getting created
-     * in OnInit(). */
-
-    if (!wxTheApp->OnInit()) return 0;
-
-    wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
-

     int retValue = 0;
 
     int retValue = 0;
 

-    if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
+    if ( !wxTheApp->OnInitGui() )
+        retValue = -1;

 
 

-    wxWindow *topWindow = wxTheApp->GetTopWindow();
-    if (topWindow)
+    // Here frames insert themselves automatically into wxTopLevelWindows by
+    // getting created in OnInit().
+    if ( retValue == 0 )

     {
     {

-        /* Forcibly delete the window. */
-        if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
-            topWindow->IsKindOf(CLASSINFO(wxDialog)) )
-        {
-            topWindow->Close( TRUE );
-            wxTheApp->DeletePendingObjects();
-        }
-        else
-        {
-            delete topWindow;
-            wxTheApp->SetTopWindow( (wxWindow*) NULL );
-        }
+        if ( !wxTheApp->OnInit() )
+            retValue = -1;

     }
 
     }
 

-    wxTheApp->OnExit();
+    if ( retValue == 0 )
+    {
+        /* delete pending toplevel windows (typically a single
+          dialog) so that, if there isn't any left, we don't
+          call OnRun() */
+        wxTheApp->DeletePendingObjects();
+       
+        wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
+
+        if (wxTheApp->Initialized())
+       {
+            retValue = wxTheApp->OnRun();
+
+            wxWindow *topWindow = wxTheApp->GetTopWindow();
+            if (topWindow)
+            {
+                /* Forcibly delete the window. */
+                if (topWindow->IsKindOf(CLASSINFO(wxFrame)) ||
+                    topWindow->IsKindOf(CLASSINFO(wxDialog)) )
+                {
+                    topWindow->Close( TRUE );
+                    wxTheApp->DeletePendingObjects();
+                }
+                else
+                {
+                    delete topWindow;
+                    wxTheApp->SetTopWindow( (wxWindow*) NULL );
+                }
+           }
+            wxTheApp->OnExit();
+        }
+    }

 
 

-    /* flush the logged messages if any */
+#if wxUSE_LOG
+    // flush the logged messages if any

     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
         log->Flush();
 
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
         log->Flush();
 

+    // continuing to use user defined log target is unsafe from now on because
+    // some resources may be already unavailable, so replace it by something
+    // more safe
+    wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
+    if ( oldlog )
+        delete oldlog;
+#endif // wxUSE_LOG
+

     wxApp::CleanUp();
 
     return retValue;
     wxApp::CleanUp();
 
     return retValue;