X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a3622daa901777a33969d8bc04e2d62dee14d164..b96ad10292136c937f71d46ecd7339e59e084c76:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 74f5e13cee..2041a588a7 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -1,412 +1,592 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/gtk/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" -#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/postscrp.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/memory.h" -#include "wx/font.h" -#include "wx/settings.h" - -#include "unistd.h" - -#ifdef USE_GDK_IMLIB -#include "../gdk_imlib/gdk_imlib.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 = 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" -//----------------------------------------------------------------------------- -// local functions -//----------------------------------------------------------------------------- +#if wxUSE_LIBHILDON + #include +#endif // wxUSE_LIBHILDON -extern void wxFlushResources(void); +#include //----------------------------------------------------------------------------- -// global functions +// link GnomeVFS //----------------------------------------------------------------------------- -void wxExit(void) -{ - gtk_main_quit(); -}; - -bool wxYield(void) -{ - while (gtk_events_pending() > 0) gtk_main_iteration(); - return TRUE; -}; +#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS + #include "wx/link.h" + wxFORCE_LINK_MODULE(gnome_vfs) +#endif //----------------------------------------------------------------------------- -// wxApp +// global data //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) +static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() +//----------------------------------------------------------------------------- +// wxYield +//----------------------------------------------------------------------------- -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) -{ - if (wxTheApp) while (wxTheApp->ProcessIdle()) {}; - usleep( 10000 ); - return TRUE; -}; +// not static because used by textctrl.cpp +// +// MT-FIXME +bool wxIsInsideYield = false; -wxApp::wxApp() +bool wxApp::Yield(bool onlyIfNeeded) { - m_idleTag = 0; - m_topWindow = NULL; - m_exitOnFrameDelete = TRUE; -}; + if ( wxIsInsideYield ) + { + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } -wxApp::~wxApp(void) -{ - gtk_idle_remove( m_idleTag ); -}; + return false; + } -bool wxApp::OnInit(void) -{ - return TRUE; -}; +#if wxUSE_THREADS + if ( !wxThread::IsMain() ) + { + // can't call gtk_main_iteration() from other threads like this + return true; + } +#endif // wxUSE_THREADS -bool wxApp::OnInitGui(void) -{ - m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); - return TRUE; -}; + wxIsInsideYield = true; -int wxApp::OnRun(void) -{ - return MainLoop(); -}; +#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 -bool wxApp::ProcessIdle(void) -{ - wxIdleEvent event; - event.SetEventObject( this ); - ProcessEvent( event ); - - return event.MoreRequested(); -}; - -void wxApp::OnIdle( wxIdleEvent &event ) -{ - static bool inOnIdle = FALSE; + while (EventsPending()) + gtk_main_iteration(); - // Avoid recursion (via ProcessEvent default case) - if (inOnIdle) - return; + // 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(); - inOnIdle = TRUE; +#if wxUSE_LOG + // let the logs be flashed again + wxLog::Resume(); +#endif - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); + wxIsInsideYield = false; - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->HasPendingMessages() ) - pLog->Flush(); + return true; +} - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); +//----------------------------------------------------------------------------- +// local functions +//----------------------------------------------------------------------------- - if (needMore) - event.RequestMore(TRUE); +// 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; +} +} - inOnIdle = FALSE; -}; +// Add signal emission hooks, to re-install idle handler when needed. +static void wx_add_idle_hooks() +{ + // "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. + { + 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); + } + } +} -bool wxApp::SendIdleEvents(void) +extern "C" { +static gboolean wxapp_idle_callback(gpointer) { - bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->Next(); - } - return needMore; -}; - -bool wxApp::SendIdleEvents( wxWindow* win ) + return wxTheApp->DoIdle(); +} +} + +bool wxApp::DoIdle() { - bool needMore = FALSE; + 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 + } - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); + gdk_threads_enter(); + bool needMore; + do { + needMore = ProcessIdle(); + } while (needMore && gtk_events_pending() == 0); + gdk_threads_leave(); - if (event.MoreRequested()) - needMore = TRUE; +#if wxUSE_THREADS + wxMutexLocker lock(*m_idleMutex); +#endif + // if a new idle source was added during ProcessIdle + if (m_idleSourceId != 0) + { + // remove it + g_source_remove(m_idleSourceId); + m_idleSourceId = 0; + } - wxNode* node = win->GetChildren()->First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; + // Pending events can be added asynchronously, + // need to keep idle source if any have appeared + needMore = needMore || HasPendingEvents(); - node = node->Next(); - } - 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::SetNativeTheme(const wxString& theme) { - wxNode *node = wxPendingDelete.First(); - while (node) - { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; + wxString path; + path = gtk_rc_get_theme_dir(); + path += "/"; + path += theme.utf8_str(); + path += "/gtk-2.0/gtkrc"; + + if ( wxFileExists(path.utf8_str()) ) + gtk_rc_add_default_file(path.utf8_str()); + else if ( wxFileExists(theme.utf8_str()) ) + gtk_rc_add_default_file(theme.utf8_str()); + else + { + wxLogWarning("Theme \"%s\" not available.", theme); + + return false; + } - if (wxPendingDelete.Member(obj)) - delete node; + gtk_rc_reparse_all_for_settings(gtk_settings_get_default(), TRUE); - node = wxPendingDelete.First(); - }; -}; + return true; +} -wxWindow *wxApp::GetTopWindow(void) +bool wxApp::OnInitGui() { - if (m_topWindow) return m_topWindow; - wxNode *node = wxTopLevelWindows.First(); - if (!node) return NULL; - return (wxWindow*)node->Data(); -}; + if ( !wxAppBase::OnInitGui() ) + return false; + + // 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(); + + 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 ); + } + } + } + } + +#if wxUSE_LIBHILDON + m_hildonProgram = hildon_program_get_instance(); + if ( !m_hildonProgram ) + { + wxLogError(_("Unable to initialize Hildon program")); + return false; + } +#endif // wxUSE_LIBHILDON + + return true; +} -void wxApp::SetTopWindow( wxWindow *win ) +GdkVisual *wxApp::GetGdkVisual() { - m_topWindow = win; -}; + GdkVisual *visual = NULL; + + XVisualInfo *xvi = (XVisualInfo *)GetXVisualInfo(); + if ( xvi ) + visual = gdkx_visual_get( xvi->visualid ); + else + visual = gdk_drawable_get_visual( wxGetRootWindow()->window ); + + wxASSERT( visual ); + + return visual; +} -void wxApp::CommonInit(void) +// use unusual names for the parameters to avoid conflict with wxApp::arg[cv] +bool wxApp::Initialize(int& argc_, wxChar **argv_) { + if ( !wxAppBase::Initialize(argc_, argv_) ) + return false; -/* -#if USE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); -#endif -*/ - wxSystemSettings::Init(); - wxTheResourceCache = new wxResourceCache(wxKEY_STRING); +#if wxUSE_THREADS + if (!g_thread_supported()) + { + g_thread_init(NULL); + gdk_threads_init(); + } +#endif // wxUSE_THREADS + + // gtk+ 2.0 supports Unicode through UTF-8 strings + wxConvCurrent = &wxConvUTF8; + + // 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"); - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); + // 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(); - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); +#endif // wxUSE_INTL + static wxConvBrokenFileNames fileconv(encName); + wxConvFileName = &fileconv; + + + bool init_result; + int i; + +#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])); + } - wxInitializeStockLists(); - wxInitializeStockObjects(); + argvGTK[argc_] = NULL; - // For PostScript printing -#if USE_POSTSCRIPT - wxInitializePrintSetupData(); - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); + int argcGTK = argc_; + +#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 ( argcGTK != argc_ ) + { + // we have to drop the parameters which were consumed by GTK+ + for ( i = 0; i < argcGTK; i++ ) + { + while ( strcmp(wxConvUTF8.cWX2MB(argv_[i]), argvGTK[i]) != 0 ) + { + memmove(argv_ + i, argv_ + i + 1, (argc_ - i)*sizeof(*argv_)); + } + } + + argc_ = argcGTK; + argv_[argc_] = NULL; + } + //else: gtk_init() didn't modify our parameters + + // free our copy + for ( i = 0; i < argcGTK; i++ ) + { + free(argvGTK[i]); + } -/* - wxBitmap::InitStandardHandlers(); + 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 - g_globalCursor = new wxCursor; -*/ + // update internal arg[cv] as GTK+ may have removed processed options: + this->argc = argc_; + this->argv = argv_; -// wxInitializeStockObjects(); -}; + if ( m_traits ) + { + // 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; + } + } + } + } + + if ( !init_result ) + { + wxLogError(_("Unable to initialize GTK+, is DISPLAY set properly?")); + return false; + } -void wxApp::CommonCleanUp(void) -{ - wxDELETE(wxTheColourDatabase); - wxDELETE(wxThePrintPaperDatabase); - wxDELETE(wxThePrintSetupData); - wxDELETE(wxTheFontNameDirectory); - wxDeleteStockObjects(); - - wxFlushResources(); - - wxDELETE(wxTheResourceCache); - - wxDeleteStockLists(); - - wxSystemSettings::Done(); -}; - -wxLog *wxApp::CreateLogTarget() -{ - return new wxLogGui; -} + // we can not enter threads before gtk_init is done + gdk_threads_enter(); -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- + wxSetDetectableAutoRepeat( true ); + +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif + +#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(); -int wxEntry( int argc, char *argv[] ) + return true; +} + +void wxApp::CleanUp() { - wxBuffer = new char[BUFSIZ + 512]; + if (m_idleSourceId != 0) + g_source_remove(m_idleSourceId); - wxClassInfo::InitializeClasses(); - -#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT + // release reference acquired by Initialize() + g_type_class_unref(g_type_class_peek(GTK_TYPE_WIDGET)); -#if !defined(_WINDLL) - streambuf* sBuf = new wxDebugStreamBuf; -#else - streambuf* sBuf = NULL; + gdk_threads_leave(); + + wxAppBase::CleanUp(); + + // 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 - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); +} +void wxApp::WakeUpIdle() +{ +#if wxUSE_THREADS + wxMutexLocker lock(*m_idleMutex); #endif - - if (!wxTheApp) - { - if (!wxApp::GetInitializerFunction()) - { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; - }; - - wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); - - 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; - - gtk_init( &argc, &argv ); - -#ifdef USE_GDK_IMLIB - - gdk_imlib_init(); - - gtk_widget_push_visual(gdk_imlib_get_visual()); - - gtk_widget_push_colormap(gdk_imlib_get_colormap()); - -#endif - - wxApp::CommonInit(); - - wxTheApp->OnInitGui(); - - // 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; - - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); - - wxTheApp->DeletePendingObjects(); - - wxTheApp->OnExit(); - - wxApp::CommonCleanUp(); - - wxDELETE(wxTheApp); - -#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); + if (m_idleSourceId == 0) + m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, 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 - - return retValue; -}; + if (m_idleSourceId != 0) + { + g_source_remove(m_idleSourceId); + m_idleSourceId = 0; + wx_add_idle_hooks(); + } + return gtk_events_pending() != 0; +} -//----------------------------------------------------------------------------- -// main() -//----------------------------------------------------------------------------- +#ifdef __WXDEBUG__ -#if defined(AIX) || defined(AIX4) || defined(____HPUX__) +void wxApp::OnAssertFailure(const wxChar *file, + int line, + const wxChar* func, + const wxChar* cond, + const wxChar *msg) +{ - // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h + // block wx idle events while assert dialog is showing + m_isInAssert = true; -#else + wxAppBase::OnAssertFailure(file, line, func, cond, msg); - int main(int argc, char *argv[]) { return wxEntry(argc, argv); } + m_isInAssert = false; +} -#endif +#endif // __WXDEBUG__ +#if wxUSE_THREADS +void wxGUIAppTraits::MutexGuiEnter() +{ + gdk_threads_enter(); +} +void wxGUIAppTraits::MutexGuiLeave() +{ + gdk_threads_leave(); +} +#endif // wxUSE_THREADS