X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cf2cb360f2ed60757a7c135f216495c3cc7b29b..cc4d5638c66a409e421420ed7110917755a66788:/src/gtk1/app.cpp?ds=sidebyside diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 11ab9c284f..5a862ee6e8 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -1,416 +1,650 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/gtk1/app.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// 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 "wx/resource.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/dialog.h" + #include "wx/settings.h" + #include "wx/msgdlg.h" + #include "wx/memory.h" + #include "wx/font.h" + #include "wx/gdicmn.h" + #include "wx/image.h" + #include "wx/module.h" +#endif + +#include "wx/file.h" +#include "wx/filename.h" +#include "wx/thread.h" + +#ifdef __WXGPE__ +#include +#endif + +#ifdef __WXUNIVERSAL__ + #include "wx/univ/theme.h" + #include "wx/univ/renderer.h" +#endif + +#if wxUSE_THREADS + #include "wx/thread.h" #endif +#include + +#ifdef HAVE_POLL + #if defined(__VMS) + #include + #else + // bug in the OpenBSD headers: at least in 3.1 there is no extern "C" + // in neither poll.h nor sys/poll.h which results in link errors later + #ifdef __OPENBSD__ + extern "C" + { + #endif + + #include + + #ifdef __OPENBSD__ + }; + #endif + #endif // platform +#else // !HAVE_POLL + // we implement poll() ourselves using select() which is supposed exist in + // all modern Unices + #include + #include + #include + #ifdef HAVE_SYS_SELECT_H + #include + #endif +#endif // HAVE_POLL/!HAVE_POLL + +#include "wx/unix/private.h" +#include "wx/gtk1/win_gtk.h" + +#include + //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -wxApp *wxTheApp = NULL; -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +bool g_mainThreadLocked = false; +gint g_pendingTag = 0; -extern wxList wxPendingDelete; -extern wxResourceCache *wxTheResourceCache; +static GtkWidget *gs_RootWindow = NULL; //----------------------------------------------------------------------------- -// local functions +// idle system //----------------------------------------------------------------------------- -extern void wxFlushResources(void); +extern bool g_isIdle; + +void wxapp_install_idle_handler(); + +#if wxUSE_THREADS +static wxMutex gs_idleTagsMutex; +#endif + //----------------------------------------------------------------------------- -// global functions +// wxWakeUpIdle //----------------------------------------------------------------------------- -void wxExit(void) -{ - gtk_main_quit(); -} +// RR/KH: The wxMutexGui calls are not needed on GTK2 according to +// the GTK faq, http://www.gtk.org/faq/#AEN500 +// The calls to gdk_threads_enter() and leave() are specifically noted +// as not being necessary. The MutexGui calls are still left in for GTK1. +// Eliminating the MutexGui calls fixes the long-standing "random" lockup +// when using wxPostEvent (which calls WakeUpIdle) from a thread. -bool wxYield(void) +void wxApp::WakeUpIdle() { - while (gtk_events_pending() > 0) gtk_main_iteration(); - return TRUE; +#if wxUSE_THREADS + if (!wxThread::IsMain()) + wxMutexGuiEnter(); +#endif // wxUSE_THREADS + + wxapp_install_idle_handler(); + +#if wxUSE_THREADS + if (!wxThread::IsMain()) + wxMutexGuiLeave(); +#endif // wxUSE_THREADS } //----------------------------------------------------------------------------- -// wxApp +// local functions //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) - -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() - -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +// the callback functions must be extern "C" to comply with GTK+ declarations +extern "C" { - if (wxTheApp) while (wxTheApp->ProcessIdle()) {} - usleep( 10000 ); - return TRUE; -} -wxApp::wxApp() +static gint wxapp_pending_callback( gpointer WXUNUSED(data) ) { - m_idleTag = 0; - m_topWindow = NULL; - m_exitOnFrameDelete = TRUE; - wxTheApp = this; -} + if (!wxTheApp) return TRUE; -wxApp::~wxApp(void) -{ - gtk_idle_remove( m_idleTag ); -} + // 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(); -bool wxApp::OnInit(void) -{ - return TRUE; -} + // Sent idle event to all who request them. + wxTheApp->ProcessPendingEvents(); -bool wxApp::OnInitGui(void) -{ - m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); - return TRUE; -} + { +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + g_pendingTag = 0; + } -int wxApp::OnRun(void) -{ - return MainLoop(); + // Flush the logged messages if any. +#if wxUSE_LOG + wxLog::FlushActive(); +#endif // wxUSE_LOG + + // Release lock again + gdk_threads_leave(); + + // Return FALSE to indicate that no more idle events are + // to be sent (single shot instead of continuous stream) + return FALSE; } -bool wxApp::ProcessIdle(void) +static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { - wxIdleEvent event; - event.SetEventObject( this ); - ProcessEvent( event ); + if (!wxTheApp) + return TRUE; + +#if wxDEBUG_LEVEL + // don't generate the idle events while the assert modal dialog is shown, + // this completely confuses the apps which don't expect to be reentered + // from some safely-looking functions + if ( wxTheApp->IsInAssert() ) + { + // But repaint the assertion message if necessary + if (wxTopLevelWindows.GetCount() > 0) + { + wxWindow* win = (wxWindow*) wxTopLevelWindows.GetLast()->GetData(); + if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog))) + win->OnInternalIdle(); + } + return TRUE; + } +#endif // wxDEBUG_LEVEL + + // 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(); + + // Indicate that we are now in idle mode and event handlers + // will have to reinstall the idle handler again. + { +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + g_isIdle = TRUE; + wxTheApp->m_idleTag = 0; + } + + // Send idle event to all who request them as long as + // no events have popped up in the event queue. + while (wxTheApp->ProcessIdle() && (gtk_events_pending() == 0)) + ; + + // Release lock again + gdk_threads_leave(); - return event.MoreRequested(); + // Return FALSE to indicate that no more idle events are + // to be sent (single shot instead of continuous stream). + return FALSE; } -void wxApp::OnIdle( wxIdleEvent &event ) +#if wxUSE_THREADS + +#ifdef HAVE_POLL + #define wxPoll poll + #define wxPollFd pollfd +#else // !HAVE_POLL + +typedef GPollFD wxPollFd; + +int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout) { - static bool inOnIdle = FALSE; + // convert timeout from ms to struct timeval (s/us) + timeval tv_timeout; + tv_timeout.tv_sec = timeout/1000; + tv_timeout.tv_usec = (timeout%1000)*1000; + + // remember the highest fd used here + int fdMax = -1; + + // and fill the sets for select() + fd_set readfds; + fd_set writefds; + fd_set exceptfds; + wxFD_ZERO(&readfds); + wxFD_ZERO(&writefds); + wxFD_ZERO(&exceptfds); + + unsigned int i; + for ( i = 0; i < nfds; i++ ) + { + wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, wxT("fd out of range") ); + + if ( ufds[i].events & G_IO_IN ) + wxFD_SET(ufds[i].fd, &readfds); + + if ( ufds[i].events & G_IO_PRI ) + wxFD_SET(ufds[i].fd, &exceptfds); - // Avoid recursion (via ProcessEvent default case) - if (inOnIdle) - return; + if ( ufds[i].events & G_IO_OUT ) + wxFD_SET(ufds[i].fd, &writefds); - inOnIdle = TRUE; + if ( ufds[i].fd > fdMax ) + fdMax = ufds[i].fd; + } - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); + fdMax++; + int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout); - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->HasPendingMessages() ) - pLog->Flush(); + // translate the results back + for ( i = 0; i < nfds; i++ ) + { + ufds[i].revents = 0; - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); + if ( wxFD_ISSET(ufds[i].fd, &readfds ) ) + ufds[i].revents |= G_IO_IN; - if (needMore) - event.RequestMore(TRUE); + if ( wxFD_ISSET(ufds[i].fd, &exceptfds ) ) + ufds[i].revents |= G_IO_PRI; - inOnIdle = FALSE; -} + if ( wxFD_ISSET(ufds[i].fd, &writefds ) ) + ufds[i].revents |= G_IO_OUT; + } -bool wxApp::SendIdleEvents(void) -{ - bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; - - node = node->Next(); - } - return needMore; + return res; } -bool wxApp::SendIdleEvents( wxWindow* win ) +#endif // HAVE_POLL/!HAVE_POLL + +static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) { - bool needMore = FALSE; + gdk_threads_enter(); - wxIdleEvent event; - event.SetEventObject(win); - win->ProcessEvent(event); + wxMutexGuiLeave(); + g_mainThreadLocked = true; - if (event.MoreRequested()) - needMore = TRUE; + // we rely on the fact that glib GPollFD struct is really just pollfd but + // I wonder how wise is this in the long term (VZ) + gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout ); - wxNode* node = win->GetChildren()->First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; + wxMutexGuiEnter(); + g_mainThreadLocked = false; - node = node->Next(); - } - return needMore ; -} + gdk_threads_leave(); -int wxApp::OnExit(void) -{ - return 0; + return res; } -int wxApp::MainLoop(void) -{ - gtk_main(); - return 0; -} +#endif // wxUSE_THREADS -void wxApp::ExitMainLoop(void) -{ - gtk_main_quit(); -} +} // extern "C" -bool wxApp::Initialized(void) +void wxapp_install_idle_handler() { - return m_initialized; -} +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif -bool wxApp::Pending(void) -{ - return FALSE; -} + // Don't install the handler if it's already installed. This test *MUST* + // be done when gs_idleTagsMutex is locked! + if (!g_isIdle) + return; -void wxApp::Dispatch(void) -{ -} + // GD: this assert is raised when using the thread sample (which works) + // so the test is probably not so easy. Can widget callbacks be + // triggered from child threads and, if so, for which widgets? + // wxASSERT_MSG( wxThread::IsMain() || gs_WakeUpIdle, wxT("attempt to install idle handler from widget callback in child thread (should be exclusively from wxWakeUpIdle)") ); -void wxApp::DeletePendingObjects(void) -{ - wxNode *node = wxPendingDelete.First(); - while (node) - { - wxObject *obj = (wxObject *)node->Data(); + wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); - delete obj; + g_isIdle = false; - if (wxPendingDelete.Member(obj)) - delete node; + if (g_pendingTag == 0) + g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); - node = wxPendingDelete.First(); - } + // 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). Very low priority. + wxTheApp->m_idleTag = gtk_idle_add_priority( 1000, wxapp_idle_callback, (gpointer) NULL ); } -wxWindow *wxApp::GetTopWindow(void) +static bool wxOKlibc() { - if (m_topWindow) return m_topWindow; - wxNode *node = wxTopLevelWindows.First(); - if (!node) return NULL; - return (wxWindow*)node->Data(); +#if defined(__UNIX__) && defined(__GLIBC__) + // glibc 2.0 uses UTF-8 even when it shouldn't + wchar_t res = 0; + if ((MB_CUR_MAX == 2) && + (wxMB2WC(&res, "\xdd\xa5", 1) == 1) && + (res==0x765)) + { + // this is UTF-8 allright, check whether that's what we want + char *cur_locale = setlocale(LC_CTYPE, NULL); + if ((strlen(cur_locale) < 4) || + (strcasecmp(cur_locale + strlen(cur_locale) - 4, "utf8")) || + (strcasecmp(cur_locale + strlen(cur_locale) - 5, "utf-8"))) { + // nope, don't use libc conversion + return false; + } + } +#endif + return true; } -void wxApp::SetTopWindow( wxWindow *win ) -{ - m_topWindow = win; -} +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- -void wxApp::CommonInit(void) +GtkWidget* wxGetRootWindow() { + if (gs_RootWindow == NULL) + { + gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( gs_RootWindow ); + } + return gs_RootWindow; +} -/* -#if USE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); -#endif -*/ - wxSystemSettings::Init(); - wxTheResourceCache = new wxResourceCache(wxKEY_STRING); - - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); +//----------------------------------------------------------------------------- +// wxApp +//----------------------------------------------------------------------------- - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); +IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) - wxInitializeStockLists(); - wxInitializeStockObjects(); +wxApp::wxApp() +{ + m_isInAssert = false; - wxInitializeResourceSystem(); + m_idleTag = 0; + g_isIdle = TRUE; + wxapp_install_idle_handler(); - // For PostScript printing -#if USE_POSTSCRIPT - wxInitializePrintSetupData(); - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); +#if wxUSE_THREADS + g_main_set_poll_func( wxapp_poll_func ); #endif + m_colorCube = (unsigned char*) NULL; -/* - wxBitmap::InitStandardHandlers(); + // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp + m_glVisualInfo = NULL; + m_glFBCInfo = NULL; +} - g_globalCursor = new wxCursor; -*/ +wxApp::~wxApp() +{ + if (m_idleTag) gtk_idle_remove( m_idleTag ); + + if (m_colorCube) free(m_colorCube); } -void wxApp::CommonCleanUp(void) +bool wxApp::OnInitGui() { - wxDELETE(wxTheColourDatabase); - wxDELETE(wxThePrintPaperDatabase); - wxDELETE(wxThePrintSetupData); - wxDELETE(wxTheFontNameDirectory); - wxDeleteStockObjects(); + if ( !wxAppBase::OnInitGui() ) + return false; - wxFlushResources(); + GdkVisual *visual = gdk_visual_get_system(); - wxDELETE(wxTheResourceCache); + // if this is a wxGLApp (derived from wxApp), and we've already + // chosen a specific visual, then derive the GdkVisual from that + if (m_glVisualInfo != NULL) + { + GdkVisual* vis = gdkx_visual_get( + ((XVisualInfo *) m_glVisualInfo) ->visualid ); + gtk_widget_set_default_visual( vis ); - wxDeleteStockLists(); + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); - wxCleanUpResourceSystem(); + visual = vis; + } - wxSystemSettings::Done(); -} + // On some machines, the default visual is just 256 colours, so + // we make sure we get the best. This can sometimes be wasteful. -wxLog *wxApp::CreateLogTarget() -{ - return new wxLogGui; -} + else + if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual)) + { + GdkVisual* vis = gdk_visual_get_best(); + gtk_widget_set_default_visual( vis ); -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); -int wxEntry( int argc, char *argv[] ) -{ - wxBuffer = new char[BUFSIZ + 512]; + visual = vis; + } - wxClassInfo::InitializeClasses(); + // Nothing to do for 15, 16, 24, 32 bit displays + if (visual->depth > 8) return TRUE; -#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT + // initialize color cube for 8-bit color reduction dithering -#if !defined(_WINDLL) - streambuf* sBuf = new wxDebugStreamBuf; -#else - streambuf* sBuf = NULL; -#endif - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); + GdkColormap *cmap = gtk_widget_get_default_colormap(); -#endif + m_colorCube = (unsigned char*)malloc(32 * 32 * 32); - if (!wxTheApp) - { - if (!wxApp::GetInitializerFunction()) + for (int r = 0; r < 32; r++) { - printf( _("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); - return 0; + 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; + } + } } - wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); - - wxObject *test_app = app_ini(); + return true; +} - wxTheApp = (wxApp*) test_app; - } +GdkVisual *wxApp::GetGdkVisual() +{ + GdkVisual *visual = NULL; - if (!wxTheApp) - { - printf( _("wxWindows error: wxTheApp == NULL\n") ); - return 0; - } + if (m_glVisualInfo) + visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); + else + visual = gdk_window_get_visual( wxGetRootWindow()->window ); - wxTheApp->argc = argc; - wxTheApp->argv = argv; + wxASSERT( visual ); - gtk_init( &argc, &argv ); + return visual; +} -#ifdef USE_GDK_IMLIB +bool wxApp::Initialize(int& argc, wxChar **argv) +{ + bool init_result; - gdk_imlib_init(); +#if wxUSE_THREADS + // GTK 1.2 up to version 1.2.3 has broken threads + if ((gtk_major_version == 1) && + (gtk_minor_version == 2) && + (gtk_micro_version < 4)) + { + printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" ); + } + else + { + if (!g_thread_supported()) + g_thread_init(NULL); + } +#endif // wxUSE_THREADS - gtk_widget_push_visual(gdk_imlib_get_visual()); + gtk_set_locale(); - gtk_widget_push_colormap(gdk_imlib_get_colormap()); + if (!wxOKlibc()) + wxConvCurrent = &wxConvLocal; -#endif +#if wxUSE_UNICODE + // gtk_init() wants UTF-8, not wchar_t, so convert + int i; + char **argvGTK = new char *[argc + 1]; + for ( i = 0; i < argc; i++ ) + { + argvGTK[i] = wxStrdupA(wxConvUTF8.cWX2MB(argv[i])); + } - wxApp::CommonInit(); + argvGTK[argc] = NULL; - wxTheApp->OnInitGui(); + int argcGTK = argc; - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). +#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 - if (!wxTheApp->OnInit()) return 0; + 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); + } + } + + argc = argcGTK; + } + //else: gtk_init() didn't modify our parameters - wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); + // free our copy + for ( i = 0; i < argcGTK; i++ ) + { + free(argvGTK[i]); + } - int retValue = 0; + 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 - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); + if (!init_result) { + wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?")); + return false; + } - wxTheApp->DeletePendingObjects(); + // we cannot enter threads before gtk_init is done + gdk_threads_enter(); - wxTheApp->OnExit(); + if ( !wxAppBase::Initialize(argc, argv) ) + { + gdk_threads_leave(); - wxApp::CommonCleanUp(); + return false; + } - wxDELETE(wxTheApp); + wxSetDetectableAutoRepeat( TRUE ); -#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 wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif - return retValue; + return true; } -//----------------------------------------------------------------------------- -// main() -//----------------------------------------------------------------------------- - -#if defined(AIX) || defined(AIX4) || defined(____HPUX__) || defined(NOMAIN) - - // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h +void wxApp::CleanUp() +{ + gdk_threads_leave(); -#else + wxAppBase::CleanUp(); +} - int main(int argc, char *argv[]) { return wxEntry(argc, argv); } +void wxApp::OnAssertFailure(const wxChar *file, + int line, + const wxChar* func, + const wxChar* cond, + const wxChar *msg) +{ + // there is no need to do anything if asserts are disabled in this build + // anyhow +#if wxDEBUG_LEVEL + // block wx idle events while assert dialog is showing + m_isInAssert = true; + + wxAppBase::OnAssertFailure(file, line, func, cond, msg); + + m_isInAssert = false; +#else // !wxDEBUG_LEVEL + wxUnusedVar(file); + wxUnusedVar(line); + wxUnusedVar(func); + wxUnusedVar(cond); + wxUnusedVar(msg); +#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL +} +void wxApp::RemoveIdleTag() +{ +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); #endif - - + if (!g_isIdle) + { + gtk_idle_remove( wxTheApp->m_idleTag ); + wxTheApp->m_idleTag = 0; + g_isIdle = true; + } +}