X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3855ef064498aadea229d8202eedd78aed3f8e1..a9efc294a979fb4ae801f7dc37af35677301212d:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 53902a97a3..138f2eac56 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/gtk/app.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,477 +7,562 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "app.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/app.h" -#include "wx/gdicmn.h" -#include "wx/utils.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/module.h" -#include "wx/image.h" -#include "wx/thread.h" -#include "unistd.h" +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/memory.h" + #include "wx/font.h" +#endif -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- +#include "wx/thread.h" -wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +#ifdef __WXGPE__ + #include +#endif -extern wxList wxPendingDelete; -extern wxResourceCache *wxTheResourceCache; +#include "wx/gtk/private.h" +#include "wx/apptrait.h" -unsigned char g_palette[64*3] = -{ - 0x0, 0x0, 0x0, - 0xff, 0xff, 0xff, - 0xff, 0x0, 0x0, - 0xff, 0xff, 0x0, - 0x0, 0xff, 0x0, - 0x0, 0x0, 0xff, - 0x0, 0xff, 0xff, - 0x99, 0x99, 0x99, - 0xff, 0x88, 0x0, - 0x88, 0x0, 0x0, - 0x0, 0x88, 0x88, - 0x88, 0x88, 0x0, - 0xff, 0xcc, 0x97, - 0xbb, 0xbb, 0xbb, - 0x9f, 0x6b, 0x42, - 0x55, 0x55, 0x55, - 0xdd, 0xdd, 0xdd, - 0x77, 0x77, 0x77, - 0x33, 0x33, 0x33, - 0xcc, 0x0, 0x0, - 0xff, 0x44, 0x0, - 0xff, 0xcc, 0x0, - 0xcc, 0xcc, 0x0, - 0x60, 0x60, 0x0, - 0x0, 0x43, 0x0, - 0x0, 0x7f, 0x0, - 0x0, 0xcc, 0x0, - 0x0, 0x44, 0x44, - 0x0, 0x0, 0x44, - 0x0, 0x0, 0x88, - 0xef, 0xb1, 0x7b, - 0xdf, 0x98, 0x5f, - 0xbf, 0x87, 0x56, - 0x7f, 0x57, 0x26, - 0x5f, 0x39, 0xc, - 0x3f, 0x1c, 0x0, - 0x21, 0x0, 0x0, - 0x0, 0x43, 0x87, - 0x2d, 0x70, 0xaf, - 0x5a, 0x9e, 0xd7, - 0x87, 0xcc, 0xff, - 0xff, 0xe0, 0xba, - 0x21, 0x43, 0xf, - 0x3d, 0x5d, 0x25, - 0x59, 0x78, 0x3a, - 0x75, 0x93, 0x4f, - 0x91, 0xae, 0x64, - 0xad, 0xc8, 0x7a, - 0xf0, 0xa8, 0xef, - 0xd0, 0x88, 0xd0, - 0xaf, 0x66, 0xaf, - 0x8e, 0x44, 0x8e, - 0x6d, 0x22, 0x6d, - 0x4b, 0x0, 0x4b, - 0xff, 0xc0, 0xbc, - 0xff, 0x93, 0x91, - 0xff, 0x66, 0x67, - 0xd8, 0xf2, 0xbf, - 0xff, 0xc9, 0x68, - 0xff, 0x96, 0x67, - 0xa5, 0x60, 0xff, - 0x51, 0xff, 0x99, - 0x3f, 0xa5, 0x63, - 0x98, 0x90, 0x67 -}; +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON + +#include //----------------------------------------------------------------------------- -// local functions +// link GnomeVFS //----------------------------------------------------------------------------- -extern void wxFlushResources(void); +#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS + #include "wx/link.h" + wxFORCE_LINK_MODULE(gnome_vfs) +#endif //----------------------------------------------------------------------------- -// global functions +// global data //----------------------------------------------------------------------------- -void wxExit(void) -{ - gtk_main_quit(); -} - -bool wxYield(void) -{ - while (gtk_events_pending() > 0) gtk_main_iteration(); - return TRUE; -} +static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; //----------------------------------------------------------------------------- -// wxApp +// wxYield //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) - -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() - -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) -{ - if (wxTheApp) while (wxTheApp->ProcessIdle()) {} - wxMutexGuiLeave(); - usleep(10000); - wxMutexGuiEnter(); - return TRUE; -} - -wxApp::wxApp() -{ - m_idleTag = 0; - m_topWindow = (wxWindow *) NULL; - m_exitOnFrameDelete = TRUE; - wxTheApp = this; -} - -wxApp::~wxApp(void) -{ - gtk_idle_remove( m_idleTag ); -} - -bool wxApp::OnInit(void) -{ - return TRUE; -} +// not static because used by textctrl.cpp +// +// MT-FIXME +bool wxIsInsideYield = false; -bool wxApp::OnInitGui(void) +bool wxApp::Yield(bool onlyIfNeeded) { - m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); - return TRUE; -} + if ( wxIsInsideYield ) + { + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } -int wxApp::OnRun(void) -{ - return MainLoop(); -} + return false; + } -bool wxApp::ProcessIdle(void) -{ - wxIdleEvent event; - event.SetEventObject( this ); - ProcessEvent( event ); +#if wxUSE_THREADS + if ( !wxThread::IsMain() ) + { + // can't call gtk_main_iteration() from other threads like this + return true; + } +#endif // wxUSE_THREADS - return event.MoreRequested(); -} + wxIsInsideYield = true; -void wxApp::OnIdle( wxIdleEvent &event ) -{ - static bool inOnIdle = FALSE; +#if wxUSE_LOG + // disable log flushing from here because a call to wxYield() shouldn't + // normally result in message boxes popping up &c + wxLog::Suspend(); +#endif - // Avoid recursion (via ProcessEvent default case) - if (inOnIdle) - return; + while (EventsPending()) + gtk_main_iteration(); - inOnIdle = 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). But we + // call ProcessIdle() only once since this is not meant for longish + // background jobs (controlled by wxIdleEvent::RequestMore() and the + // return value of Processidle(). + ProcessIdle(); - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); +#if wxUSE_LOG + // let the logs be flashed again + wxLog::Resume(); +#endif - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if (pLog != NULL && pLog->HasPendingMessages()) - pLog->Flush(); + wxIsInsideYield = false; - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); + return true; +} - if (needMore) - event.RequestMore(TRUE); +//----------------------------------------------------------------------------- +// local functions +//----------------------------------------------------------------------------- - inOnIdle = FALSE; +// One-shot signal emission hook, to install idle handler. +extern "C" { +static gboolean +wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data) +{ + wxApp* app = wxTheApp; + if (app != NULL) + app->WakeUpIdle(); + gulong* hook_id = (gulong*)data; + // record that hook is not installed + *hook_id = 0; + // remove hook + return false; +} } -bool wxApp::SendIdleEvents(void) +// Add signal emission hooks, to re-install idle handler when needed. +static void wx_add_idle_hooks() { - bool needMore = FALSE; - - wxNode* node = wxTopLevelWindows.First(); - while (node) + // "event" hook + { + static gulong hook_id = 0; + if (hook_id == 0) + { + static guint sig_id = 0; + if (sig_id == 0) + sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET); + hook_id = g_signal_add_emission_hook( + sig_id, 0, wx_emission_hook, &hook_id, NULL); + } + } + // "size_allocate" hook + // Needed to match the behavior of the old idle system, + // but probably not necessary. { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; - node = node->Next(); + static gulong hook_id = 0; + if (hook_id == 0) + { + static guint sig_id = 0; + if (sig_id == 0) + sig_id = g_signal_lookup("size_allocate", GTK_TYPE_WIDGET); + hook_id = g_signal_add_emission_hook( + sig_id, 0, wx_emission_hook, &hook_id, NULL); + } } - return needMore; } -bool wxApp::SendIdleEvents( wxWindow* win ) +extern "C" { +static gboolean wxapp_idle_callback(gpointer) { - bool needMore = FALSE; + return wxTheApp->DoIdle(); +} +} - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); +bool wxApp::DoIdle() +{ + guint id_save; + { + // Allow another idle source to be added while this one is busy. + // Needed if an idle event handler runs a new event loop, + // for example by showing a dialog. +#if wxUSE_THREADS + wxMutexLocker lock(*m_idleMutex); +#endif + id_save = m_idleSourceId; + m_idleSourceId = 0; + wx_add_idle_hooks(); +#ifdef __WXDEBUG__ + // don't generate the idle events while the assert modal dialog is shown, + // this matches the behavior of wxMSW + if (m_isInAssert) + return false; +#endif + } - if (event.MoreRequested()) - needMore = TRUE; + gdk_threads_enter(); + bool needMore; + do { + needMore = ProcessIdle(); + } while (needMore && gtk_events_pending() == 0); + gdk_threads_leave(); - wxNode* node = win->GetChildren().First(); - while (node) +#if wxUSE_THREADS + wxMutexLocker lock(*m_idleMutex); +#endif + // if a new idle source was added during ProcessIdle + if (m_idleSourceId != 0) { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->Next(); + // remove it + g_source_remove(m_idleSourceId); + m_idleSourceId = 0; } - return needMore ; + // if more idle processing requested + if (needMore) + { + // keep this source installed + m_idleSourceId = id_save; + return true; + } + // add hooks and remove this source + wx_add_idle_hooks(); + return false; } -int wxApp::OnExit(void) -{ - return 0; -} +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- -int wxApp::MainLoop(void) +GtkWidget* wxGetRootWindow() { - gtk_main(); - return 0; + if (gs_RootWindow == NULL) + { + gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( gs_RootWindow ); + } + return gs_RootWindow; } -void wxApp::ExitMainLoop(void) -{ - gtk_main_quit(); -} +//----------------------------------------------------------------------------- +// wxApp +//----------------------------------------------------------------------------- -bool wxApp::Initialized(void) -{ - return m_initialized; -} +IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) -bool wxApp::Pending(void) +wxApp::wxApp() { - return FALSE; +#ifdef __WXDEBUG__ + m_isInAssert = false; +#endif // __WXDEBUG__ +#if wxUSE_THREADS + m_idleMutex = NULL; +#endif + m_idleSourceId = 0; } -void wxApp::Dispatch(void) +wxApp::~wxApp() { } -void wxApp::DeletePendingObjects(void) +bool wxApp::OnInitGui() { - wxNode *node = wxPendingDelete.First(); - while (node) - { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; + if ( !wxAppBase::OnInitGui() ) + return false; - if (wxPendingDelete.Member(obj)) - delete node; + // if this is a wxGLApp (derived from wxApp), and we've already + // chosen a specific visual, then derive the GdkVisual from that + if ( GetXVisualInfo() ) + { + GdkVisual* vis = gtk_widget_get_default_visual(); - node = wxPendingDelete.First(); + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); + } + else + { + // On some machines, the default visual is just 256 colours, so + // we make sure we get the best. This can sometimes be wasteful. + if (m_useBestVisual) + { + if (m_forceTrueColour) + { + GdkVisual* visual = gdk_visual_get_best_with_both( 24, GDK_VISUAL_TRUE_COLOR ); + if (!visual) + { + wxLogError(wxT("Unable to initialize TrueColor visual.")); + return false; + } + GdkColormap *colormap = gdk_colormap_new( visual, FALSE ); + gtk_widget_set_default_colormap( colormap ); + } + else + { + if (gdk_visual_get_best() != gdk_visual_get_system()) + { + GdkVisual* visual = gdk_visual_get_best(); + GdkColormap *colormap = gdk_colormap_new( visual, FALSE ); + gtk_widget_set_default_colormap( colormap ); + } + } + } } -} -wxWindow *wxApp::GetTopWindow(void) -{ - if (m_topWindow) return m_topWindow; - wxNode *node = wxTopLevelWindows.First(); - if (!node) return (wxWindow *) NULL; - return (wxWindow*)node->Data(); -} +#if wxUSE_LIBHILDON + m_hildonProgram = hildon_program_get_instance(); + if ( !m_hildonProgram ) + { + wxLogError(_("Unable to initialize Hildon program")); + return false; + } +#endif // wxUSE_LIBHILDON -void wxApp::SetTopWindow( wxWindow *win ) -{ - m_topWindow = win; + return true; } -void wxApp::CommonInit(void) +GdkVisual *wxApp::GetGdkVisual() { + GdkVisual *visual = NULL; -/* -#if wxUSE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); -#endif -*/ - wxSystemSettings::Init(); - wxTheResourceCache = new wxResourceCache(wxKEY_STRING); - - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); + XVisualInfo *xvi = (XVisualInfo *)GetXVisualInfo(); + if ( xvi ) + visual = gdkx_visual_get( xvi->visualid ); + else + visual = gdk_drawable_get_visual( wxGetRootWindow()->window ); - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); + wxASSERT( visual ); - wxInitializeStockLists(); - wxInitializeStockObjects(); - - wxInitializeResourceSystem(); - - wxImage::InitStandardHandlers(); - -// g_globalCursor = new wxCursor; + return visual; } -void wxApp::CommonCleanUp(void) +// use unusual names for the parameters to avoid conflict with wxApp::arg[cv] +bool wxApp::Initialize(int& argc_, wxChar **argv_) { - wxDELETE(wxTheColourDatabase); - wxDELETE(wxTheFontNameDirectory); - wxDeleteStockObjects(); - - wxFlushResources(); - - wxDELETE(wxTheResourceCache); + if ( !wxAppBase::Initialize(argc_, argv_) ) + return false; - wxDeleteStockLists(); - - wxCleanUpResourceSystem(); +#if wxUSE_THREADS + if (!g_thread_supported()) + { + g_thread_init(NULL); + gdk_threads_init(); + } +#endif // wxUSE_THREADS + + // We should have the wxUSE_WCHAR_T test on the _outside_ +#if wxUSE_WCHAR_T + // gtk+ 2.0 supports Unicode through UTF-8 strings + wxConvCurrent = &wxConvUTF8; +#else // !wxUSE_WCHAR_T + if (!wxOKlibc()) + wxConvCurrent = (wxMBConv*) NULL; +#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T + + // decide which conversion to use for the file names + + // (1) this variable exists for the sole purpose of specifying the encoding + // of the filenames for GTK+ programs, so use it if it is set + wxString encName(wxGetenv(_T("G_FILENAME_ENCODING"))); + encName = encName.BeforeFirst(_T(',')); + if (encName.CmpNoCase(_T("@locale")) == 0) + encName.clear(); + encName.MakeUpper(); +#if wxUSE_INTL + if (encName.empty()) + { + // (2) if a non default locale is set, assume that the user wants his + // filenames in this locale too + encName = wxLocale::GetSystemEncodingName().Upper(); + // (3) finally use UTF-8 by default + if (encName.empty() || encName == _T("US-ASCII")) + encName = _T("UTF-8"); + wxSetEnv(_T("G_FILENAME_ENCODING"), encName); + } +#else + if (encName.empty()) + encName = _T("UTF-8"); - wxImage::CleanUpHandlers(); + // if wxUSE_INTL==0 it probably indicates that only "C" locale is supported + // by the program anyhow so prevent GTK+ from calling setlocale(LC_ALL, "") + // from gtk_init_check() as it does by default + gtk_disable_setlocale(); - wxSystemSettings::Done(); -} +#endif // wxUSE_INTL + static wxConvBrokenFileNames fileconv(encName); + wxConvFileName = &fileconv; -wxLog *wxApp::CreateLogTarget() -{ - return new wxLogGui; -} -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- + bool init_result; + int i; -int wxEntry( int argc, char *argv[] ) -{ - wxBuffer = new char[BUFSIZ + 512]; +#if wxUSE_UNICODE + // gtk_init() wants UTF-8, not wchar_t, so convert + char **argvGTK = new char *[argc_ + 1]; + for ( i = 0; i < argc_; i++ ) + { + argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv_[i])); + } - wxClassInfo::InitializeClasses(); + argvGTK[argc_] = NULL; - /* Debug stream no longer used -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + int argcGTK = argc_; - streambuf* sBuf = new wxDebugStreamBuf; - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); +#ifdef __WXGPE__ + init_result = true; // is there a _check() version of this? + gpe_application_init( &argcGTK, &argvGTK ); +#else + init_result = gtk_init_check( &argcGTK, &argvGTK ); #endif -*/ + wxUpdateLocaleIsUtf8(); - if (!wxTheApp) + if ( argcGTK != argc_ ) { - if (!wxApp::GetInitializerFunction()) + // we have to drop the parameters which were consumed by GTK+ + for ( i = 0; i < argcGTK; i++ ) { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; + while ( strcmp(wxConvUTF8.cWX2MB(argv_[i]), argvGTK[i]) != 0 ) + { + memmove(argv_ + i, argv_ + i + 1, (argc_ - i)*sizeof(*argv_)); + } } - wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); - - wxObject *test_app = app_ini(); - - wxTheApp = (wxApp*) test_app; + argc_ = argcGTK; } + //else: gtk_init() didn't modify our parameters - if (!wxTheApp) + // free our copy + for ( i = 0; i < argcGTK; i++ ) { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; + free(argvGTK[i]); } - wxTheApp->argc = argc; - wxTheApp->argv = argv; + delete [] argvGTK; +#else // !wxUSE_UNICODE + // gtk_init() shouldn't actually change argv_ itself (just its contents) so + // it's ok to pass pointer to it + init_result = gtk_init_check( &argc_, &argv_ ); +#endif // wxUSE_UNICODE/!wxUSE_UNICODE - char name[200]; - strcpy( name, argv[0] ); - strcpy( name, wxFileNameFromPath(name) ); - wxStripExtension( name ); - wxTheApp->SetAppName( name ); + // update internal arg[cv] as GTK+ may have removed processed options: + this->argc = argc_; + this->argv = argv_; - gtk_set_locale(); - - gtk_init( &argc, &argv ); - - GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); - - for (int i = 0; i < 64; i++) + if ( m_traits ) { - 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 ); + // if there are still GTK+ standard options unparsed in the command + // line, it means that they were not syntactically correct and GTK+ + // already printed a warning on the command line and we should now + // exit: + wxArrayString opt, desc; + m_traits->GetStandardCmdLineOptions(opt, desc); + + for ( i = 0; i < argc_; i++ ) + { + // leave just the names of the options with values + const wxString str = wxString(argv_[i]).BeforeFirst('='); + + for ( size_t j = 0; j < opt.size(); j++ ) + { + // remove the leading spaces from the option string as it does + // have them + if ( opt[j].Trim(false).BeforeFirst('=') == str ) + { + // a GTK+ option can be left on the command line only if + // there was an error in (or before, in another standard + // options) it, so abort, just as we do if incorrect + // program option is given + wxLogError(_("Invalid GTK+ command line option, use \"%s --help\""), + argv_[0]); + return false; + } + } + } } - gtk_widget_push_colormap( cmap ); - - gtk_widget_set_default_colormap( cmap ); - - wxApp::CommonInit(); + if ( !init_result ) + { + wxLogError(_("Unable to initialize GTK+, is DISPLAY set properly?")); + return false; + } - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; + // we can not enter threads before gtk_init is done + gdk_threads_enter(); - wxTheApp->OnInitGui(); + wxSetDetectableAutoRepeat( true ); - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif - if (!wxTheApp->OnInit()) return 0; +#if wxUSE_THREADS + m_idleMutex = new wxMutex; +#endif + // make sure GtkWidget type is loaded, idle hooks need it + g_type_class_ref(GTK_TYPE_WIDGET); + WakeUpIdle(); - wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); + return true; +} - int retValue = 0; +void wxApp::CleanUp() +{ + if (m_idleSourceId != 0) + g_source_remove(m_idleSourceId); - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); + // release reference acquired by Initialize() + g_type_class_unref(g_type_class_peek(GTK_TYPE_WIDGET)); - wxTheApp->DeletePendingObjects(); + gdk_threads_leave(); - wxTheApp->OnExit(); + wxAppBase::CleanUp(); - wxModule::CleanUpModules(); + // delete this mutex as late as possible as it's used from WakeUpIdle(), in + // particular do it after calling the base class CleanUp() which can result + // in it being called +#if wxUSE_THREADS + delete m_idleMutex; + m_idleMutex = NULL; +#endif +} - wxApp::CommonCleanUp(); +void wxApp::WakeUpIdle() +{ +#if wxUSE_THREADS + wxMutexLocker lock(*m_idleMutex); +#endif + if (m_idleSourceId == 0) + m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL); +} - delete wxTheApp; - wxTheApp = (wxApp*) NULL; +// Checking for pending events requires first removing our idle source, +// otherwise it will cause the check to always return true. +bool wxApp::EventsPending() +{ +#if wxUSE_THREADS + wxMutexLocker lock(*m_idleMutex); +#endif + if (m_idleSourceId != 0) + { + g_source_remove(m_idleSourceId); + m_idleSourceId = 0; + wx_add_idle_hooks(); + } + return gtk_events_pending() != 0; +} - wxClassInfo::CleanUpClasses(); +#ifdef __WXDEBUG__ - delete[] wxBuffer; +void wxApp::OnAssertFailure(const wxChar *file, + int line, + const wxChar* func, + const wxChar* cond, + const wxChar *msg) +{ -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + // block wx idle events while assert dialog is showing + m_isInAssert = true; - if (wxDebugContext::CountObjectsLeft() > 0) - { - wxLogDebug("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } -// wxDebugContext::SetStream(NULL, NULL); + wxAppBase::OnAssertFailure(file, line, func, cond, msg); -#endif + m_isInAssert = false; +} - wxLog *oldLog = wxLog::SetActiveTarget( NULL ); - if (oldLog) delete oldLog; +#endif // __WXDEBUG__ - return retValue; +#if wxUSE_THREADS +void wxGUIAppTraits::MutexGuiEnter() +{ + gdk_threads_enter(); } -//----------------------------------------------------------------------------- - +void wxGUIAppTraits::MutexGuiLeave() +{ + gdk_threads_leave(); +} +#endif // wxUSE_THREADS