X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce6d2511f82aafc78aba320018c868f826ab172b..2a31049201e9c1ff9f515eb9d144ae392f4b4e5a:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 43a5a92aa9..ba0fd8ed6b 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -178,7 +178,7 @@ void wxapp_install_thread_wakeup() { if (wxTheApp->m_wakeUpTimerTag) return; - wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 500, wxapp_wakeup_timerout_callback, (gpointer) NULL ); + wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 50, wxapp_wakeup_timerout_callback, (gpointer) NULL ); } void wxapp_uninstall_thread_wakeup() @@ -476,17 +476,16 @@ bool wxApp::Initialize() wxPendingEventsLocker = new wxCriticalSection(); #endif -/* - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); -*/ - wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); wxTheColourDatabase->Initialize(); wxInitializeStockLists(); wxInitializeStockObjects(); +#if wxUSE_WX_RESOURCES + wxInitializeResourceSystem(); +#endif + wxModule::RegisterModules(); if (!wxModule::InitializeModules()) return FALSE; @@ -497,15 +496,15 @@ void wxApp::CleanUp() { wxModule::CleanUpModules(); +#if wxUSE_WX_RESOURCES + wxCleanUpResourceSystem(); +#endif + if (wxTheColourDatabase) delete wxTheColourDatabase; + wxTheColourDatabase = (wxColourDatabase*) NULL; -/* - if (wxTheFontNameDirectory) delete wxTheFontNameDirectory; - wxTheFontNameDirectory = (wxFontNameDirectory*) NULL; -*/ - wxDeleteStockObjects(); wxDeleteStockLists();