X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd0eed647daeb257f28699de879d2f4f5aeb7fb6..0c0890656219df340e90c8f3ba230c50490096aa:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 3db5bd03a7..a6b21a616b 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -4,11 +4,11 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "app.h" + #pragma implementation "app.h" #endif #include "wx/app.h" @@ -19,10 +19,25 @@ #include "wx/memory.h" #include "wx/font.h" #include "wx/settings.h" -#include "wx/resource.h" +#include "wx/dialog.h" + +#if wxUSE_WX_RESOURCES + #include "wx/resource.h" +#endif + +#include "wx/module.h" +#include "wx/image.h" + +#include "wx/thread.h" #include "unistd.h" +#include +#include +#include + +#include "wx/gtk/win_gtk.h" + //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- @@ -30,8 +45,12 @@ 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 bool g_isIdle; unsigned char g_palette[64*3] = { @@ -83,12 +102,12 @@ unsigned char g_palette[64*3] = 0x75, 0x93, 0x4f, 0x91, 0xae, 0x64, 0xad, 0xc8, 0x7a, - 0xf0, 0xa8, 0xef, + 0xf0, 0xa8, 0xef, 0xd0, 0x88, 0xd0, 0xaf, 0x66, 0xaf, 0x8e, 0x44, 0x8e, 0x6d, 0x22, 0x6d, - 0x4b, 0x0, 0x4b, + 0x4b, 0x0, 0x4b, 0xff, 0xc0, 0xbc, 0xff, 0x93, 0x91, 0xff, 0x66, 0x67, @@ -111,16 +130,131 @@ extern void wxFlushResources(void); // global functions //----------------------------------------------------------------------------- -void wxExit(void) +void wxExit() { - gtk_main_quit(); + gtk_main_quit(); +} + +/* forward declaration */ +gint wxapp_idle_callback( gpointer WXUNUSED(data) ); + +bool wxYield() +{ + /* 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 + + 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; + + while (gtk_events_pending()) + gtk_main_iteration(); + + /* 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) ) +{ + 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 + + return TRUE; +} + +void wxapp_install_idle_handler() +{ + wxASSERT_MSG( wxTheApp->m_idleTag == 0, "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; } -bool wxYield(void) +#if wxUSE_THREADS +static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) { - while (gtk_events_pending() > 0) gtk_main_iteration(); - return TRUE; + 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(); + +#if (GTK_MINOR_VERSION > 0) + /* release lock again */ + GDK_THREADS_LEAVE (); +#endif + + wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL ); + + return TRUE; } +#endif //----------------------------------------------------------------------------- // wxApp @@ -132,90 +266,172 @@ BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) EVT_IDLE(wxApp::OnIdle) END_EVENT_TABLE() -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) -{ - if (wxTheApp) while (wxTheApp->ProcessIdle()) {} - usleep( 10000 ); - return TRUE; -} - wxApp::wxApp() { - m_idleTag = 0; - m_topWindow = (wxWindow *) NULL; - m_exitOnFrameDelete = TRUE; - wxTheApp = this; -} + wxTheApp = this; -wxApp::~wxApp(void) -{ - gtk_idle_remove( m_idleTag ); -} + m_topWindow = (wxWindow *) NULL; + m_exitOnFrameDelete = TRUE; -bool wxApp::OnInit(void) -{ - return TRUE; + m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + +#if wxUSE_THREADS + m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL ); +#endif + + m_colorCube = (unsigned char*) NULL; } -bool wxApp::OnInitGui(void) +wxApp::~wxApp() { - m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); - return TRUE; + 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); } -int wxApp::OnRun(void) +bool wxApp::OnInitGui() { - return MainLoop(); + /* Nothing to do for 15, 16, 24, 32 bit displays */ + + 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. + NOTE: this doesn't really seem to work this way... */ + + /* + GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); + + for (int i = 0; i < 64; i++) + { + GdkColor col; + col.red = g_palette[i*3 + 0] << 8; + col.green = g_palette[i*3 + 1] << 8; + col.blue = g_palette[i*3 + 2] << 8; + col.pixel = 0; + + gdk_color_alloc( cmap, &col ); + } + + gtk_widget_set_default_colormap( cmap ); + */ + + /* initialize color cube for 8-bit color reduction dithering */ + + GdkColormap *cmap = gtk_widget_get_default_colormap(); + + 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); + + int index = -1; + + GdkColor *colors = cmap->colors; + if (colors) + { + 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; + } + } + } + + return TRUE; } -bool wxApp::ProcessIdle(void) +bool wxApp::ProcessIdle() { - wxIdleEvent event; - event.SetEventObject( this ); - ProcessEvent( event ); + wxIdleEvent event; + event.SetEventObject( this ); + ProcessEvent( event ); - return event.MoreRequested(); + return event.MoreRequested(); } void wxApp::OnIdle( wxIdleEvent &event ) { - static bool inOnIdle = FALSE; + static bool inOnIdle = FALSE; - // Avoid recursion (via ProcessEvent default case) - if (inOnIdle) - return; + /* Avoid recursion (via ProcessEvent default case) */ + if (inOnIdle) + return; - inOnIdle = TRUE; + inOnIdle = TRUE; - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); +#if wxUSE_THREADS + /* Resend in the main thread events which have been prepared in other + threads */ + ProcessPendingEvents(); +#endif - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->HasPendingMessages() ) - pLog->Flush(); + /* 'Garbage' collection of windows deleted with Close(). */ + DeletePendingObjects(); - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); + /* flush the logged messages if any */ + wxLog *log = wxLog::GetActiveTarget(); + if (log != NULL && log->HasPendingMessages()) + log->Flush(); - if (needMore) - event.RequestMore(TRUE); + /* Send OnIdle events to all windows */ + bool needMore = SendIdleEvents(); - inOnIdle = FALSE; + if (needMore) + event.RequestMore(TRUE); + + inOnIdle = FALSE; } -bool wxApp::SendIdleEvents(void) +bool wxApp::SendIdleEvents() { bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) + + wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); + while (node) + { + wxWindow* win = node->GetData(); + if (SendIdleEvents(win)) needMore = TRUE; + node = node->GetNext(); + } - node = node->Next(); - } return needMore; } @@ -223,262 +439,311 @@ bool wxApp::SendIdleEvents( wxWindow* win ) { bool needMore = FALSE; - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); + wxIdleEvent event; + event.SetEventObject(win); + + win->OnInternalIdle(); + + win->ProcessEvent(event); if (event.MoreRequested()) needMore = TRUE; - wxNode* node = win->GetChildren()->First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) + wxNode* node = win->GetChildren().First(); + while (node) + { + wxWindow* win = (wxWindow*) node->Data(); + if (SendIdleEvents(win)) needMore = TRUE; - node = node->Next(); - } + node = node->Next(); + } return needMore ; } -int wxApp::OnExit(void) +int wxApp::MainLoop() { - return 0; + gtk_main(); + return 0; } -int wxApp::MainLoop(void) +void wxApp::ExitMainLoop() { - gtk_main(); - return 0; + gtk_main_quit(); } -void wxApp::ExitMainLoop(void) +bool wxApp::Initialized() { - gtk_main_quit(); + return m_initialized; } -bool wxApp::Initialized(void) +bool wxApp::Pending() { - return m_initialized; + return (gtk_events_pending() > 0); } -bool wxApp::Pending(void) +void wxApp::Dispatch() { - return FALSE; + gtk_main_iteration(); } -void wxApp::Dispatch(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(void) +void wxApp::DeletePendingObjects() { - wxNode *node = wxPendingDelete.First(); - while (node) - { - wxObject *obj = (wxObject *)node->Data(); + wxNode *node = wxPendingDelete.First(); + while (node) + { + wxObject *obj = (wxObject *)node->Data(); - 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 ) { - m_topWindow = win; + m_topWindow = win; } -void wxApp::CommonInit(void) +bool wxApp::Initialize() { + wxBuffer = new wxChar[BUFSIZ + 512]; -/* -#if wxUSE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); + wxClassInfo::InitializeClasses(); + + 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(); */ - wxSystemSettings::Init(); - wxTheResourceCache = new wxResourceCache(wxKEY_STRING); - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); + wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); + wxTheColourDatabase->Initialize(); + + wxInitializeStockLists(); + wxInitializeStockObjects(); - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); +#if wxUSE_WX_RESOURCES + wxTheResourceCache = new wxResourceCache( wxKEY_STRING ); - wxInitializeStockLists(); - wxInitializeStockObjects(); + wxInitializeResourceSystem(); +#endif + + wxImage::InitStandardHandlers(); + + /* no global cursor under X + g_globalCursor = new wxCursor; */ - wxInitializeResourceSystem(); + wxModule::RegisterModules(); + if (!wxModule::InitializeModules()) return FALSE; - wxImage::InitStandardHandlers(); - -// g_globalCursor = new wxCursor; + return TRUE; } -void wxApp::CommonCleanUp(void) +void wxApp::CleanUp() { - wxDELETE(wxTheColourDatabase); - wxDELETE(wxTheFontNameDirectory); - wxDeleteStockObjects(); + wxModule::CleanUpModules(); - wxFlushResources(); +#if wxUSE_WX_RESOURCES + wxFlushResources(); - wxDELETE(wxTheResourceCache); + if (wxTheResourceCache) + delete wxTheResourceCache; + wxTheResourceCache = (wxResourceCache*) NULL; - wxDeleteStockLists(); + wxCleanUpResourceSystem(); +#endif - wxCleanUpResourceSystem(); - - wxImage::CleanUpHandlers(); + if (wxTheColourDatabase) + delete wxTheColourDatabase; + wxTheColourDatabase = (wxColourDatabase*) NULL; - wxSystemSettings::Done(); -} +/* + if (wxTheFontNameDirectory) delete wxTheFontNameDirectory; + wxTheFontNameDirectory = (wxFontNameDirectory*) NULL; +*/ -wxLog *wxApp::CreateLogTarget() -{ - return new wxLogGui; -} + wxDeleteStockObjects(); -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- + wxDeleteStockLists(); -int wxEntry( int argc, char *argv[] ) -{ - wxBuffer = new char[BUFSIZ + 512]; + wxImage::CleanUpHandlers(); + + delete wxTheApp; + wxTheApp = (wxApp*) NULL; - 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 + delete wxPendingEvents; + delete wxPendingEventsLocker; +#endif -#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + wxSystemSettings::Done(); - streambuf* sBuf = new wxDebugStreamBuf; - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); + delete[] wxBuffer; -#endif + wxClassInfo::CleanUpClasses(); - if (!wxTheApp) - { - if (!wxApp::GetInitializerFunction()) + // check for memory leaks +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + if (wxDebugContext::CountObjectsLeft() > 0) { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; + wxLogDebug(_T("There were memory leaks.\n")); + wxDebugContext::Dump(); + wxDebugContext::PrintStatistics(); } +#endif // Debug - wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); + // do this as the very last thing because everything else can log messages + wxLog::DontCreateOnDemand(); - wxObject *test_app = app_ini(); - - wxTheApp = (wxApp*) test_app; - } - - if (!wxTheApp) - { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; - } - - wxTheApp->argc = argc; - wxTheApp->argv = argv; - - char name[200]; - strcpy( name, argv[0] ); - strcpy( name, wxFileNameFromPath(name) ); - wxStripExtension( name ); - wxTheApp->SetAppName( name ); - - gtk_set_locale(); - - gtk_init( &argc, &argv ); - - GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); - - for (int i = 0; i < 64; i++) - { - GdkColor col; - col.red = g_palette[i*3 + 0] << 8; - col.green = g_palette[i*3 + 1] << 8; - col.blue = g_palette[i*3 + 2] << 8; - col.pixel = 0; - - gdk_color_alloc( cmap, &col ); - } - - gtk_widget_push_colormap( cmap ); - - gtk_widget_set_default_colormap( cmap ); + wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); + if (oldLog) + delete oldLog; +} - wxApp::CommonInit(); +wxLog *wxApp::CreateLogTarget() +{ + return new wxLogGui; +} - wxTheApp->OnInitGui(); +//----------------------------------------------------------------------------- +// wxEntry +//----------------------------------------------------------------------------- - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). +int wxEntry( int argc, char *argv[] ) +{ + gtk_set_locale(); - if (!wxTheApp->OnInit()) return 0; + gtk_init( &argc, &argv ); - wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); + wxSetDetectableAutoRepeat( TRUE ); + + if (!wxApp::Initialize()) + return -1; - int retValue = 0; + if (!wxTheApp) + { + wxCHECK_MSG( wxApp::GetInitializerFunction(), -1, + _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); + wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); - wxTheApp->DeletePendingObjects(); + wxObject *test_app = app_ini(); - wxTheApp->OnExit(); + wxTheApp = (wxApp*) test_app; + } - wxApp::CommonCleanUp(); + wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") ); - wxDELETE(wxTheApp); + wxTheApp->argc = argc; + wxTheApp->argv = argv; - wxLog *oldLog = wxLog::SetActiveTarget( NULL ); - if (oldLog) delete oldLog; - - wxClassInfo::CleanUpClasses(); - - delete[] wxBuffer; - -#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - - if (wxDebugContext::CountObjectsLeft() > 0) - { - wxTrace("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } - wxDebugContext::SetStream(NULL, NULL); - -#endif + wxString name(wxFileNameFromPath(argv[0])); + wxStripExtension( name ); + wxTheApp->SetAppName( name ); - return retValue; -} + int retValue = 0; -//----------------------------------------------------------------------------- -// main() -//----------------------------------------------------------------------------- + if ( !wxTheApp->OnInitGui() ) + retValue = -1; -#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN) + // Here frames insert themselves automatically into wxTopLevelWindows by + // getting created in OnInit(). + if ( retValue == 0 ) + { + if ( !wxTheApp->OnInit() ) + retValue = -1; + } - // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h + 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(); + } + } -#else + // flush the logged messages if any + wxLog *log = wxLog::GetActiveTarget(); + if (log != NULL && log->HasPendingMessages()) + log->Flush(); - int main(int argc, char *argv[]) { return wxEntry(argc, argv); } + // 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 + wxApp::CleanUp(); + return retValue; +}