X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a56f55c02d718e9da7574807cb01e4d2cf6a1fa..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/gtk1/app.cpp diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 391f5a8d1c..4d25eb73de 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -2,294 +2,743 @@ // 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" +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) + #pragma implementation "app.h" #endif +#ifdef __VMS +// vms_jackets.h should for proper working be included before anything else +# include +#undef ConnectionNumber +#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/dialog.h" +#include "wx/msgdlg.h" +#include "wx/file.h" +#include "wx/filename.h" +#include "wx/module.h" +#include "wx/image.h" +#include "wx/thread.h" + +#ifdef __WXGPE__ +#include +#endif -#include "unistd.h" +#ifdef __WXUNIVERSAL__ + #include "wx/univ/theme.h" + #include "wx/univ/renderer.h" +#endif -#ifdef USE_GDK_IMLIB -#include "gdk_imlib.h" +#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 +#endif // HAVE_POLL/!HAVE_POLL + +#include "wx/gtk/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; +static GtkWidget *gs_RootWindow = (GtkWidget*) 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 +// wxYield //----------------------------------------------------------------------------- -void wxExit(void) -{ - gtk_main_quit(); -}; +// not static because used by textctrl.cpp +// +// MT-FIXME +bool wxIsInsideYield = FALSE; -bool wxYield(void) +bool wxApp::Yield(bool onlyIfNeeded) { - while (gtk_events_pending() > 0) gtk_main_iteration(); - return TRUE; -}; + if ( wxIsInsideYield ) + { + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } + + return FALSE; + } + +#if wxUSE_THREADS + if ( !wxThread::IsMain() ) + { + // can't call gtk_main_iteration() from other threads like this + return TRUE; + } +#endif // wxUSE_THREADS + + wxIsInsideYield = TRUE; + + // We need to remove idle callbacks or the loop will + // never finish. + wxTheApp->RemoveIdleTag(); + +#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 + + 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). 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(); + +#if wxUSE_LOG + // let the logs be flashed again + wxLog::Resume(); +#endif + + wxIsInsideYield = FALSE; + + return TRUE; +} //----------------------------------------------------------------------------- -// wxApp +// wxWakeUpIdle //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) +// 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. -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +void wxApp::WakeUpIdle() { - if (wxTheApp) wxTheApp->OnIdle(); - usleep( 10000 ); - return TRUE; -}; +#ifndef __WXGTK20__ +#if wxUSE_THREADS + if (!wxThread::IsMain()) + wxMutexGuiEnter(); +#endif // wxUSE_THREADS_ +#endif // __WXGTK2__ + + wxapp_install_idle_handler(); + +#ifndef __WXGTK20__ +#if wxUSE_THREADS + if (!wxThread::IsMain()) + wxMutexGuiLeave(); +#endif // wxUSE_THREADS_ +#endif // __WXGTK2__ +} -wxApp::wxApp() -{ - m_idleTag = 0; - m_topWindow = NULL; - m_exitOnFrameDelete = TRUE; -}; +//----------------------------------------------------------------------------- +// local functions +//----------------------------------------------------------------------------- -wxApp::~wxApp(void) +// the callback functions must be extern "C" to comply with GTK+ declarations +extern "C" { - gtk_idle_remove( m_idleTag ); -}; -bool wxApp::OnInit(void) +static gint wxapp_pending_callback( gpointer WXUNUSED(data) ) { - return TRUE; -}; + if (!wxTheApp) return TRUE; -bool wxApp::OnInitGui(void) -{ - m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); - return TRUE; -}; + // 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(); -int wxApp::OnRun(void) -{ - return MainLoop(); -}; + // Sent idle event to all who request them. + wxTheApp->ProcessPendingEvents(); -bool wxApp::OnIdle(void) -{ - DeletePendingObjects(); - return FALSE; -}; + { +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + g_pendingTag = 0; + } -int wxApp::OnExit(void) -{ - return 0; -}; + // Flush the logged messages if any. +#if wxUSE_LOG + wxLog::FlushActive(); +#endif // wxUSE_LOG -int wxApp::MainLoop(void) -{ - gtk_main(); - return 0; -}; + // 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; +} -void wxApp::ExitMainLoop(void) +static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { - gtk_main_quit(); -}; + if (!wxTheApp) + return TRUE; + +#ifdef __WXDEBUG__ + // 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(); +#ifdef __WXGTK20__ + if (win->IsKindOf(CLASSINFO(wxMessageDialog))) +#else + if (win->IsKindOf(CLASSINFO(wxGenericMessageDialog))) +#endif + win->OnInternalIdle(); + } + return TRUE; + } +#endif // __WXDEBUG__ + + // 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 FALSE to indicate that no more idle events are + // to be sent (single shot instead of continuous stream). + return FALSE; +} -bool wxApp::Initialized(void) +#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) { - return m_initialized; -}; + // 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; + FD_ZERO(&readfds); + FD_ZERO(&writefds); + FD_ZERO(&exceptfds); + + unsigned int i; + for ( i = 0; i < nfds; i++ ) + { + wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") ); + + if ( ufds[i].events & G_IO_IN ) + FD_SET(ufds[i].fd, &readfds); + + if ( ufds[i].events & G_IO_PRI ) + FD_SET(ufds[i].fd, &exceptfds); + + if ( ufds[i].events & G_IO_OUT ) + FD_SET(ufds[i].fd, &writefds); + + if ( ufds[i].fd > fdMax ) + fdMax = ufds[i].fd; + } + + fdMax++; + int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout); + + // translate the results back + for ( i = 0; i < nfds; i++ ) + { + ufds[i].revents = 0; + + if ( FD_ISSET(ufds[i].fd, &readfds ) ) + ufds[i].revents |= G_IO_IN; + + if ( FD_ISSET(ufds[i].fd, &exceptfds ) ) + ufds[i].revents |= G_IO_PRI; + + if ( FD_ISSET(ufds[i].fd, &writefds ) ) + ufds[i].revents |= G_IO_OUT; + } + + return res; +} + +#endif // HAVE_POLL/!HAVE_POLL -bool wxApp::Pending(void) +static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) { - return FALSE; -}; + gdk_threads_enter(); + + wxMutexGuiLeave(); + g_mainThreadLocked = 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 ); + + wxMutexGuiEnter(); + g_mainThreadLocked = FALSE; -void wxApp::Dispatch(void) + gdk_threads_leave(); + + return res; +} + +#endif // wxUSE_THREADS + +} // extern "C" + +void wxapp_install_idle_handler() { -}; +#if wxUSE_THREADS + wxMutexLocker lock(gs_idleTagsMutex); +#endif + + // Don't install the handler if it's already installed. This test *MUST* + // be done when gs_idleTagsMutex is locked! + if (!g_isIdle) + return; + + // 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)") ); + + wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); + + g_isIdle = FALSE; -void wxApp::DeletePendingObjects(void) + if (g_pendingTag == 0) + g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); + + // 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 ); +} + +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- + +GtkWidget* wxGetRootWindow() { - wxNode *node = wxPendingDelete.First(); - while (node) - { - wxObject *obj = (wxObject *)node->Data(); - - delete obj; + if (gs_RootWindow == NULL) + { + gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( gs_RootWindow ); + } + return gs_RootWindow; +} + +//----------------------------------------------------------------------------- +// wxApp +//----------------------------------------------------------------------------- - if (wxPendingDelete.Member(obj)) - delete node; +IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) - node = wxPendingDelete.First(); - }; -}; +BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxAppBase::OnIdle) +END_EVENT_TABLE() -wxWindow *wxApp::GetTopWindow(void) +wxApp::wxApp() { - if (m_topWindow) return m_topWindow; - wxNode *node = wxTopLevelWindows.First(); - if (!node) return NULL; - return (wxWindow*)node->Data(); -}; +#ifdef __WXDEBUG__ + m_isInAssert = FALSE; +#endif // __WXDEBUG__ + + m_idleTag = 0; + g_isIdle = TRUE; + wxapp_install_idle_handler(); + +#if wxUSE_THREADS + g_main_set_poll_func( wxapp_poll_func ); +#endif + + m_colorCube = (unsigned char*) NULL; + + // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp + m_glVisualInfo = (void *) NULL; + m_glFBCInfo = (void *) NULL; +} -void wxApp::SetTopWindow( wxWindow *win ) +wxApp::~wxApp() { - m_topWindow = win; -}; + if (m_idleTag) gtk_idle_remove( m_idleTag ); + + if (m_colorCube) free(m_colorCube); +} -void wxApp::CommonInit(void) +bool wxApp::OnInitGui() { + if ( !wxAppBase::OnInitGui() ) + return FALSE; -/* -#if USE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); + GdkVisual *visual = gdk_visual_get_system(); + + // 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) + { +#ifdef __WXGTK20__ + // seems gtk_widget_set_default_visual no longer exists? + GdkVisual* vis = gtk_widget_get_default_visual(); +#else + GdkVisual* vis = gdkx_visual_get( + ((XVisualInfo *) m_glVisualInfo) ->visualid ); + gtk_widget_set_default_visual( vis ); #endif -*/ - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); - wxInitializeStockObjects(); + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); + + visual = vis; + } + + // On some machines, the default visual is just 256 colours, so + // we make sure we get the best. This can sometimes be wasteful. - // For PostScript printing -#if USE_POSTSCRIPT - wxInitializePrintSetupData(); - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); + else + if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual)) + { +#ifdef __WXGTK20__ + /* seems gtk_widget_set_default_visual no longer exists? */ + GdkVisual* vis = gtk_widget_get_default_visual(); +#else + GdkVisual* vis = gdk_visual_get_best(); + gtk_widget_set_default_visual( vis ); #endif + GdkColormap *colormap = gdk_colormap_new( vis, FALSE ); + gtk_widget_set_default_colormap( colormap ); -/* - wxBitmap::InitStandardHandlers(); + visual = vis; + } - g_globalCursor = new wxCursor; -*/ + // Nothing to do for 15, 16, 24, 32 bit displays + if (visual->depth > 8) return TRUE; - wxInitializeStockObjects(); -}; + // initialize color cube for 8-bit color reduction dithering -void wxApp::CommonCleanUp(void) -{ - wxDeleteStockObjects(); - - wxFlushResources(); -}; - -wxLog *wxApp::CreateLogTarget() -{ - return new wxLogGui; -} + GdkColormap *cmap = gtk_widget_get_default_colormap(); -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- + m_colorCube = (unsigned char*)malloc(32 * 32 * 32); -int wxEntry( int argc, char *argv[] ) + 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 + { + // 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; + } + } + } + + return TRUE; +} + +GdkVisual *wxApp::GetGdkVisual() { - wxBuffer = new char[BUFSIZ + 512]; + GdkVisual *visual = NULL; - wxClassInfo::InitializeClasses(); - - 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(); + if (m_glVisualInfo) + visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); + else + visual = gdk_window_get_visual( wxGetRootWindow()->window ); + + wxASSERT( visual ); + + return visual; +} + +bool wxApp::Initialize(int& argc, wxChar **argv) +{ + bool init_result; - wxTheApp = (wxApp*) test_app; +#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_set_locale(); + + // We should have the wxUSE_WCHAR_T test on the _outside_ +#if wxUSE_WCHAR_T + #if defined(__WXGTK20__) + // gtk+ 2.0 supports Unicode through UTF-8 strings + wxConvCurrent = &wxConvUTF8; + #else // GTK 1.x + if (!wxOKlibc()) + wxConvCurrent = &wxConvLocal; + #endif +#else // !wxUSE_WCHAR_T + if (!wxOKlibc()) + wxConvCurrent = (wxMBConv*) NULL; +#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T + +#ifdef __WXGTK20__ + // 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"))); + if (encName == _T("@locale")) + 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"); +#endif // wxUSE_INTL + static wxConvBrokenFileNames fileconv(encName); + wxConvFileName = &fileconv; +#endif // __WXGTK20__ + +#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])); + } + + argvGTK[argc] = NULL; + + int argcGTK = argc; -// wxTheApp = (wxApp*)( app_ini() ); - }; - - if (!wxTheApp) - { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; - }; - -// printf( "Programmstart.\n" ); - - 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 +#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 ( 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 + + // free our copy + for ( i = 0; i < argcGTK; i++ ) + { + free(argvGTK[i]); + } + + 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 (!init_result) { + wxLogError(wxT("Unable to initialize gtk, is DISPLAY set properly?")); + return false; + } - 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(); - - return retValue; -}; + // we can not enter threads before gtk_init is done + gdk_threads_enter(); -//----------------------------------------------------------------------------- -// main() -//----------------------------------------------------------------------------- + if ( !wxAppBase::Initialize(argc, argv) ) + { + gdk_threads_leave(); -#if defined(AIX) || defined(AIX4) /* || defined(____HPUX__) */ + return false; + } - // main in IMPLEMENT_WX_MAIN in IMPLEMENT_APP in app.h + wxSetDetectableAutoRepeat( TRUE ); -#else +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif + + return true; +} - int main(int argc, char *argv[]) { return wxEntry(argc, argv); } +void wxApp::CleanUp() +{ + gdk_threads_leave(); -#endif + wxAppBase::CleanUp(); +} +#ifdef __WXDEBUG__ +void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) +{ + m_isInAssert = TRUE; + + wxAppBase::OnAssert(file, line, cond, msg); + + m_isInAssert = FALSE; +} + +#endif // __WXDEBUG__ + +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; + } +}