X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..c8b4eea8f23cd90e8b8390f2a742f0f828c57461:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 8843aa8dad..f656b326eb 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -2,158 +2,404 @@ // Name: app.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling, Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "app.h" + #pragma implementation "app.h" #endif #include "wx/app.h" #include "wx/gdicmn.h" #include "wx/utils.h" -#include "wx/postscrp.h" #include "wx/intl.h" #include "wx/log.h" #include "wx/memory.h" #include "wx/font.h" #include "wx/settings.h" -#include "wx/resource.h" +#include "wx/dialog.h" -#include "unistd.h" +#if wxUSE_WX_RESOURCES + #include "wx/resource.h" +#endif + +#include "wx/module.h" +#include "wx/image.h" -#ifdef USE_GDK_IMLIB -#include "../gdk_imlib/gdk_imlib.h" +#if wxUSE_THREADS +#include "wx/thread.h" #endif +#include + +#include +#include +#include + +#include "wx/gtk/win_gtk.h" + //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; -extern wxList wxPendingDelete; extern wxResourceCache *wxTheResourceCache; +extern bool g_isIdle; //----------------------------------------------------------------------------- // local functions //----------------------------------------------------------------------------- -extern void wxFlushResources(void); +extern void wxFlushResources(); + +/* forward declaration */ +gint wxapp_idle_callback( gpointer WXUNUSED(data) ); +void wxapp_install_idle_handler(); + +#if wxUSE_THREADS +gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ); +#endif //----------------------------------------------------------------------------- -// global functions +// wxExit //----------------------------------------------------------------------------- -void wxExit(void) +void wxExit() { - gtk_main_quit(); + gtk_main_quit(); } -bool wxYield(void) +//----------------------------------------------------------------------------- +// wxYield +//----------------------------------------------------------------------------- + +bool wxYield() { - while (gtk_events_pending() > 0) gtk_main_iteration(); - return TRUE; + bool has_idle = (wxTheApp->m_idleTag != 0); + + if (has_idle) + { + /* 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(); + + /* 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 (has_idle) + { + /* re-add idle handler */ + wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + } + + return TRUE; } //----------------------------------------------------------------------------- -// wxApp +// wxWakeUpIdle //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) +void wxWakeUpIdle() +{ + if (g_isIdle) + wxapp_install_idle_handler(); +} -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() +//----------------------------------------------------------------------------- +// local functions +//----------------------------------------------------------------------------- gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { - if (wxTheApp) while (wxTheApp->ProcessIdle()) {} - usleep( 10000 ); - return TRUE; + 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; } -wxApp::wxApp() +void wxapp_install_idle_handler() { - m_idleTag = 0; - m_topWindow = (wxWindow *) NULL; - m_exitOnFrameDelete = TRUE; - wxTheApp = this; + wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); + + /* This routine gets called by all event handlers + indicating that the idle is over. It may also + get called from other thread for sending events + to the main thread (and processing these in + idle time). */ + +#if wxUSE_THREADS + if (!wxThread::IsMain()) + GDK_THREADS_ENTER (); +#endif + + wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + + g_isIdle = FALSE; + +#if wxUSE_THREADS + if (!wxThread::IsMain()) + GDK_THREADS_LEAVE (); +#endif } -wxApp::~wxApp(void) +#if wxUSE_THREADS + +void wxapp_install_thread_wakeup() { - gtk_idle_remove( m_idleTag ); + if (wxTheApp->m_wakeUpTimerTag) return; + + wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 100, wxapp_wakeup_timerout_callback, (gpointer) NULL ); } -bool wxApp::OnInit(void) +void wxapp_uninstall_thread_wakeup() { - return TRUE; + if (!wxTheApp->m_wakeUpTimerTag) return; + + gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag ); + wxTheApp->m_wakeUpTimerTag = 0; } -bool wxApp::OnInitGui(void) +gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) ) { - m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); - return TRUE; + wxapp_uninstall_thread_wakeup(); + +#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 + + wxapp_install_thread_wakeup(); + + return TRUE; } -int wxApp::OnRun(void) +#endif // wxUSE_THREADS + +//----------------------------------------------------------------------------- +// wxApp +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) + +BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxApp::OnIdle) +END_EVENT_TABLE() + +wxApp::wxApp() { - return MainLoop(); + wxTheApp = this; + + m_topWindow = (wxWindow *) NULL; + m_exitOnFrameDelete = TRUE; + + m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); + +#if wxUSE_THREADS + m_wakeUpTimerTag = 0; + wxapp_install_thread_wakeup(); +#endif + + m_colorCube = (unsigned char*) NULL; } -bool wxApp::ProcessIdle(void) +wxApp::~wxApp() { - wxIdleEvent event; - event.SetEventObject( this ); - ProcessEvent( event ); + if (m_idleTag) gtk_idle_remove( m_idleTag ); + +#if wxUSE_THREADS + wxapp_uninstall_thread_wakeup(); +#endif - return event.MoreRequested(); + if (m_colorCube) free(m_colorCube); +} + +bool wxApp::OnInitGui() +{ + GdkVisual *visual = gdk_visual_get_system(); + + /* on some machines, the default visual is just 256 colours, so + we make sure we get the best. this can sometimes be wasteful, + of course, but what do these guys pay $30.000 for? */ +/* + if (gdk_visual_get_best() != gdk_visual_get_system()) + { + GdkVisual* vis = gdk_visual_get_best(); + gtk_widget_set_default_visual( vis ); + + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); + + visual = vis; + } +*/ + + /* Nothing to do for 15, 16, 24, 32 bit displays */ + if (visual->depth > 8) return TRUE; + + /* 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 + { +#if (GTK_MINOR_VERSION > 0) + /* 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; +#else + wxFAIL_MSG( wxT("Unsupported graphics hardware") ); +#endif + } + m_colorCube[ (r*1024) + (g*32) + b ] = index; + } + } + } + + return TRUE; +} + +bool wxApp::ProcessIdle() +{ + wxIdleEvent event; + event.SetEventObject( this ); + ProcessEvent( event ); + + return event.MoreRequested(); } void wxApp::OnIdle( wxIdleEvent &event ) { - static bool inOnIdle = FALSE; + static bool s_inOnIdle = FALSE; - // Avoid recursion (via ProcessEvent default case) - if (inOnIdle) - return; + /* Avoid recursion (via ProcessEvent default case) */ + if (s_inOnIdle) + return; - inOnIdle = TRUE; + s_inOnIdle = TRUE; - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); + /* Resend in the main thread events which have been prepared in other + threads */ + ProcessPendingEvents(); - // 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 */ +#if wxUSE_LOG + wxLog *log = wxLog::GetActiveTarget(); + if (log != NULL && log->HasPendingMessages()) + log->Flush(); +#endif // wxUSE_LOG - if (needMore) - event.RequestMore(TRUE); + /* Send OnIdle events to all windows */ + bool needMore = SendIdleEvents(); - inOnIdle = FALSE; + if (needMore) + event.RequestMore(TRUE); + + s_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; } @@ -161,256 +407,313 @@ bool wxApp::SendIdleEvents( wxWindow* win ) { bool needMore = FALSE; - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); + wxIdleEvent event; + event.SetEventObject(win); + + win->ProcessEvent(event); + + win->OnInternalIdle(); 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; -} - -int wxApp::MainLoop(void) -{ - gtk_main(); - return 0; + gtk_main(); + return 0; } -void wxApp::ExitMainLoop(void) +void wxApp::ExitMainLoop() { - gtk_main_quit(); + if (gtk_main_level() > 0) + 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) +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) +bool wxApp::Initialize() { - if (m_topWindow) return m_topWindow; - wxNode *node = wxTopLevelWindows.First(); - if (!node) return (wxWindow *) NULL; - return (wxWindow*)node->Data(); -} + wxBuffer = new wxChar[BUFSIZ + 512]; -void wxApp::SetTopWindow( wxWindow *win ) -{ - m_topWindow = win; -} + wxClassInfo::InitializeClasses(); -void wxApp::CommonInit(void) -{ + wxSystemSettings::Init(); -/* -#if USE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); + // 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 -*/ - wxSystemSettings::Init(); - wxTheResourceCache = new wxResourceCache(wxKEY_STRING); - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); +/* + wxTheFontNameDirectory = new wxFontNameDirectory; + wxTheFontNameDirectory->Initialize(); +*/ - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); + wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); + wxTheColourDatabase->Initialize(); - wxInitializeStockLists(); - wxInitializeStockObjects(); + wxInitializeStockLists(); + wxInitializeStockObjects(); - wxInitializeResourceSystem(); +#if wxUSE_WX_RESOURCES + wxTheResourceCache = new wxResourceCache( wxKEY_STRING ); - // For PostScript printing -#if USE_POSTSCRIPT - wxInitializePrintSetupData(); - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); + wxInitializeResourceSystem(); #endif + wxModule::RegisterModules(); + if (!wxModule::InitializeModules()) return FALSE; -/* - wxBitmap::InitStandardHandlers(); - - g_globalCursor = new wxCursor; -*/ + return TRUE; } -void wxApp::CommonCleanUp(void) +void wxApp::CleanUp() { - wxDELETE(wxTheColourDatabase); - wxDELETE(wxThePrintPaperDatabase); - wxDELETE(wxThePrintSetupData); - wxDELETE(wxTheFontNameDirectory); - wxDeleteStockObjects(); + wxModule::CleanUpModules(); - wxFlushResources(); +#if wxUSE_WX_RESOURCES + wxFlushResources(); - wxDELETE(wxTheResourceCache); + if (wxTheResourceCache) + delete wxTheResourceCache; + wxTheResourceCache = (wxResourceCache*) NULL; - wxDeleteStockLists(); + wxCleanUpResourceSystem(); +#endif - wxCleanUpResourceSystem(); + 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]; + 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 && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT + wxSystemSettings::Done(); -#if !defined(_WINDLL) - streambuf* sBuf = new wxDebugStreamBuf; -#else - streambuf* sBuf = NULL; -#endif - 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(wxT("There were memory leaks.\n")); + wxDebugContext::Dump(); + wxDebugContext::PrintStatistics(); } +#endif // Debug - wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); +#if wxUSE_LOG + // do this as the very last thing because everything else can log messages + wxLog::DontCreateOnDemand(); - wxObject *test_app = app_ini(); - - wxTheApp = (wxApp*) test_app; - } + wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); + if (oldLog) + delete oldLog; +#endif // wxUSE_LOG +} - if (!wxTheApp) - { - printf( _("wxWindows error: wxTheApp == NULL\n") ); - return 0; - } +//----------------------------------------------------------------------------- +// wxEntry +//----------------------------------------------------------------------------- - wxTheApp->argc = argc; - wxTheApp->argv = argv; +int wxEntry( int argc, char *argv[] ) +{ + gtk_set_locale(); - gtk_init( &argc, &argv ); +#if wxUSE_WCHAR_T + if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; +#else + if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; +#endif -#ifdef USE_GDK_IMLIB + gtk_init( &argc, &argv ); - gdk_imlib_init(); + wxSetDetectableAutoRepeat( TRUE ); - gtk_widget_push_visual(gdk_imlib_get_visual()); + if (!wxApp::Initialize()) + return -1; - gtk_widget_push_colormap(gdk_imlib_get_colormap()); + if (!wxTheApp) + { + wxCHECK_MSG( wxApp::GetInitializerFunction(), -1, + wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); -#endif + wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); - wxApp::CommonInit(); + wxObject *test_app = app_ini(); - wxTheApp->OnInitGui(); + wxTheApp = (wxApp*) test_app; + } - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). + wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") ); - if (!wxTheApp->OnInit()) return 0; + wxTheApp->argc = argc; +#if wxUSE_UNICODE + wxTheApp->argv = new wxChar*[argc+1]; + int mb_argc = 0; + while (mb_argc < argc) { + wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc])); + mb_argc++; + } + wxTheApp->argv[mb_argc] = (wxChar *)NULL; +#else + wxTheApp->argv = argv; +#endif - wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); + wxString name(wxFileNameFromPath(argv[0])); + wxStripExtension( name ); + wxTheApp->SetAppName( name ); - int retValue = 0; + int retValue = 0; - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); + if ( !wxTheApp->OnInitGui() ) + retValue = -1; - wxTheApp->DeletePendingObjects(); + // Here frames insert themselves automatically into wxTopLevelWindows by + // getting created in OnInit(). + if ( retValue == 0 ) + { + 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(); + } + } - wxApp::CommonCleanUp(); +#if wxUSE_LOG + // flush the logged messages if any + wxLog *log = wxLog::GetActiveTarget(); + if (log != NULL && log->HasPendingMessages()) + log->Flush(); - wxDELETE(wxTheApp); + // 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 -#if (WXDEBUG && USE_MEMORY_TRACING) || USE_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() > 0) - { - wxTrace("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } - wxDebugContext::SetStream(NULL, NULL); -#endif + wxApp::CleanUp(); - return retValue; + return retValue; } -//----------------------------------------------------------------------------- -// main() -//----------------------------------------------------------------------------- - -#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN) +#include "wx/gtk/info.xpm" +#include "wx/gtk/error.xpm" +#include "wx/gtk/question.xpm" +#include "wx/gtk/warning.xpm" - // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h - -#else +wxIcon +wxApp::GetStdIcon(int which) const +{ + switch(which) + { + case wxICON_INFORMATION: + return wxIcon(info_xpm); - int main(int argc, char *argv[]) { return wxEntry(argc, argv); } + case wxICON_QUESTION: + return wxIcon(question_xpm); -#endif + case wxICON_EXCLAMATION: + return wxIcon(warning_xpm); + default: + wxFAIL_MSG(wxT("requested non existent standard icon")); + // still fall through + case wxICON_HAND: + return wxIcon(error_xpm); + } +}