X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/app.cpp?ds=inline diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp index 6b3be61991..65710bb24d 100644 --- a/src/gtk1/app.cpp +++ b/src/gtk1/app.cpp @@ -8,7 +8,11 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "app.h" + #pragma implementation "app.h" +#endif + +#ifdef __VMS +#include #endif #include "wx/app.h" @@ -19,166 +23,425 @@ #include "wx/memory.h" #include "wx/font.h" #include "wx/settings.h" -#include "wx/resource.h" +#include "wx/dialog.h" + +#if wxUSE_WX_RESOURCES + #include "wx/resource.h" +#endif + #include "wx/module.h" #include "wx/image.h" -#include "wx/thread.h" -#include "unistd.h" +#ifdef __WXUNIVERSAL__ + #include "wx/univ/theme.h" + #include "wx/univ/renderer.h" +#endif + +#if wxUSE_THREADS + #include "wx/thread.h" +#endif -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#ifdef __VMS +# include +#else +# include +#endif #include "wx/gtk/win_gtk.h" +#include + + //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- wxApp *wxTheApp = (wxApp *) NULL; -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; - -extern wxList wxPendingDelete; -extern wxResourceCache *wxTheResourceCache; - -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 -}; +wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; + +bool g_mainThreadLocked = FALSE; +gint g_pendingTag = 0; + +static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; //----------------------------------------------------------------------------- -// local functions +// idle system //----------------------------------------------------------------------------- -extern void wxFlushResources(void); +extern bool g_isIdle; + +void wxapp_install_idle_handler(); //----------------------------------------------------------------------------- -// global functions +// wxExit //----------------------------------------------------------------------------- -void wxExit(void) +void wxExit() { gtk_main_quit(); } -bool wxYield(void) +//----------------------------------------------------------------------------- +// wxYield +//----------------------------------------------------------------------------- + +bool wxApp::Yield(bool onlyIfNeeded) { - while (gtk_events_pending() > 0) gtk_main_iteration(); + // MT-FIXME + static bool s_inYield = FALSE; + + if ( s_inYield ) + { + 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 + + s_inYield = TRUE; + + if (!g_isIdle) + { + // We need to remove idle callbacks or the loop will + // never finish. + gtk_idle_remove( m_idleTag ); + m_idleTag = 0; + g_isIdle = TRUE; + } + + // disable log flushing from here because a call to wxYield() shouldn't + // normally result in message boxes popping up &c + wxLog::Suspend(); + + 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(); + + // let the logs be flashed again + wxLog::Resume(); + + s_inYield = FALSE; + return TRUE; } //----------------------------------------------------------------------------- -// wxApp +// wxWakeUpIdle //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) +void wxWakeUpIdle() +{ +#if wxUSE_THREADS + if (!wxThread::IsMain()) + wxMutexGuiEnter(); +#endif -BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) -END_EVENT_TABLE() + if (g_isIdle) + wxapp_install_idle_handler(); + +#if wxUSE_THREADS + if (!wxThread::IsMain()) + wxMutexGuiLeave(); +#endif +} + +//----------------------------------------------------------------------------- +// local functions +//----------------------------------------------------------------------------- + +// the callback functions must be extern "C" to comply with GTK+ declarations +extern "C" +{ + +static gint wxapp_pending_callback( gpointer WXUNUSED(data) ) +{ + if (!wxTheApp) 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(); + + // Sent idle event to all who request them. + wxTheApp->ProcessPendingEvents(); + + g_pendingTag = 0; + + // 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; +} + +static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +{ + 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() ) + { + 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. + 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; +} -gint wxapp_idle_callback( gpointer WXUNUSED(data) ) +#if wxUSE_THREADS + +static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) { - if (wxTheApp) while (wxTheApp->ProcessIdle()) {} + gint res; + gdk_threads_enter(); + wxMutexGuiLeave(); - usleep(10000); + g_mainThreadLocked = TRUE; + + res = poll( (struct pollfd*) ufds, nfds, timeout ); + wxMutexGuiEnter(); - return TRUE; + g_mainThreadLocked = FALSE; + + gdk_threads_leave(); + + return res; } -wxApp::wxApp() +#endif // wxUSE_THREADS + +} // extern "C" + +void wxapp_install_idle_handler() { - m_idleTag = 0; - m_topWindow = (wxWindow *) NULL; - m_exitOnFrameDelete = TRUE; - wxTheApp = this; + wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); + + g_isIdle = FALSE; + + 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 ); } -wxApp::~wxApp(void) +//----------------------------------------------------------------------------- +// Access to the root window global +//----------------------------------------------------------------------------- + +GtkWidget* wxGetRootWindow() { - gtk_idle_remove( m_idleTag ); + if (gs_RootWindow == NULL) + { + gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( gs_RootWindow ); + } + return gs_RootWindow; } -bool wxApp::OnInit(void) +//----------------------------------------------------------------------------- +// wxApp +//----------------------------------------------------------------------------- + +IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) + +BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxApp::OnIdle) +END_EVENT_TABLE() + +wxApp::wxApp() { - return TRUE; + m_initialized = FALSE; +#ifdef __WXDEBUG__ + m_isInAssert = FALSE; +#endif // __WXDEBUG__ + + m_idleTag = 0; + 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; +} + +wxApp::~wxApp() +{ + if (m_idleTag) gtk_idle_remove( m_idleTag ); + + if (m_colorCube) free(m_colorCube); } -bool wxApp::OnInitGui(void) +bool wxApp::OnInitGui() { - m_idleTag = gtk_idle_add( wxapp_idle_callback, NULL ); + if ( !wxAppBase::OnInitGui() ) + return FALSE; + + 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 + + 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. + + 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 ); + + visual = vis; + } + + // Nothing to do for 15, 16, 24, 32 bit displays + if (visual->depth > 8) return TRUE; + + // initialize color cube for 8-bit color reduction dithering + + GdkColormap *cmap = gtk_widget_get_default_colormap(); + + m_colorCube = (unsigned char*)malloc(32 * 32 * 32); + + 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; } -int wxApp::OnRun(void) +GdkVisual *wxApp::GetGdkVisual() { - return MainLoop(); + GdkVisual *visual = NULL; + + 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::ProcessIdle(void) +bool wxApp::ProcessIdle() { wxIdleEvent event; event.SetEventObject( this ); @@ -189,21 +452,20 @@ bool wxApp::ProcessIdle(void) void wxApp::OnIdle( wxIdleEvent &event ) { - static bool inOnIdle = FALSE; + static bool s_inOnIdle = FALSE; // Avoid recursion (via ProcessEvent default case) - if (inOnIdle) + if (s_inOnIdle) return; - inOnIdle = TRUE; + s_inOnIdle = TRUE; - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); + // Resend in the main thread events which have been prepared in other + // threads + ProcessPendingEvents(); - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if (pLog != NULL && pLog->HasPendingMessages()) - pLog->Flush(); + // 'Garbage' collection of windows deleted with Close() + DeletePendingObjects(); // Send OnIdle events to all windows bool needMore = SendIdleEvents(); @@ -211,21 +473,22 @@ void wxApp::OnIdle( wxIdleEvent &event ) if (needMore) event.RequestMore(TRUE); - inOnIdle = FALSE; + s_inOnIdle = FALSE; } -bool wxApp::SendIdleEvents(void) +bool wxApp::SendIdleEvents() { bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); + wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow* win = node->GetData(); if (SendIdleEvents(win)) needMore = TRUE; - node = node->Next(); + node = node->GetNext(); } + return needMore; } @@ -235,7 +498,10 @@ bool wxApp::SendIdleEvents( wxWindow* win ) wxIdleEvent event; event.SetEventObject(win); - win->ProcessEvent(event); + + win->GetEventHandler()->ProcessEvent(event); + + win->OnInternalIdle(); if (event.MoreRequested()) needMore = TRUE; @@ -249,40 +515,38 @@ bool wxApp::SendIdleEvents( wxWindow* win ) node = node->Next(); } - return needMore ; -} - -int wxApp::OnExit(void) -{ - return 0; + + return needMore; } -int wxApp::MainLoop(void) +int wxApp::MainLoop() { gtk_main(); return 0; } -void wxApp::ExitMainLoop(void) +void wxApp::ExitMainLoop() { - gtk_main_quit(); + if (gtk_main_level() > 0) + gtk_main_quit(); } -bool wxApp::Initialized(void) +bool wxApp::Initialized() { return m_initialized; } -bool wxApp::Pending(void) +bool wxApp::Pending() { - return FALSE; + return (gtk_events_pending() > 0); } -void wxApp::Dispatch(void) +void wxApp::Dispatch() { + gtk_main_iteration(); } -void wxApp::DeletePendingObjects(void) +void wxApp::DeletePendingObjects() { wxNode *node = wxPendingDelete.First(); while (node) @@ -291,103 +555,194 @@ void wxApp::DeletePendingObjects(void) delete obj; - if (wxPendingDelete.Member(obj)) - delete node; + if (wxPendingDelete.Find(obj)) + delete node; node = wxPendingDelete.First(); } } -wxWindow *wxApp::GetTopWindow(void) +bool wxApp::Initialize() { - if (m_topWindow) return m_topWindow; - wxNode *node = wxTopLevelWindows.First(); - if (!node) return (wxWindow *) NULL; - return (wxWindow*)node->Data(); -} + wxClassInfo::InitializeClasses(); -void wxApp::SetTopWindow( wxWindow *win ) -{ - m_topWindow = win; +#if wxUSE_INTL + wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); +#endif + + // GL: I'm annoyed ... I don't know where to put this and I don't want to + // create a module for that as it's part of the core. +#if wxUSE_THREADS + wxPendingEvents = new wxList(); + wxPendingEventsLocker = new wxCriticalSection(); +#endif + + wxTheColourDatabase = new wxColourDatabase( wxKEY_STRING ); + wxTheColourDatabase->Initialize(); + + wxInitializeStockLists(); + wxInitializeStockObjects(); + +#if wxUSE_WX_RESOURCES + wxInitializeResourceSystem(); +#endif + + wxModule::RegisterModules(); + if (!wxModule::InitializeModules()) return FALSE; + + return TRUE; } -void wxApp::CommonInit(void) +void wxApp::CleanUp() { + wxModule::CleanUpModules(); -/* -#if wxUSE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); +#if wxUSE_WX_RESOURCES + wxCleanUpResourceSystem(); #endif -*/ - wxSystemSettings::Init(); - wxTheResourceCache = new wxResourceCache(wxKEY_STRING); - wxTheFontNameDirectory = new wxFontNameDirectory; - wxTheFontNameDirectory->Initialize(); + delete wxTheColourDatabase; + wxTheColourDatabase = (wxColourDatabase*) NULL; - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); + wxDeleteStockObjects(); - wxInitializeStockLists(); - wxInitializeStockObjects(); + wxDeleteStockLists(); - wxInitializeResourceSystem(); + delete wxTheApp; + wxTheApp = (wxApp*) NULL; + + wxClassInfo::CleanUpClasses(); + +#if wxUSE_THREADS + delete wxPendingEvents; + delete wxPendingEventsLocker; +#endif + + // check for memory leaks +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + if (wxDebugContext::CountObjectsLeft(TRUE) > 0) + { + wxLogDebug(wxT("There were memory leaks.\n")); + wxDebugContext::Dump(); + wxDebugContext::PrintStatistics(); + } +#endif // Debug - wxImage::InitStandardHandlers(); +#if wxUSE_LOG + // do this as the very last thing because everything else can log messages + wxLog::DontCreateOnDemand(); -// g_globalCursor = new wxCursor; + wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL ); + if (oldLog) + delete oldLog; +#endif // wxUSE_LOG } -void wxApp::CommonCleanUp(void) +//----------------------------------------------------------------------------- +// wxEntry +//----------------------------------------------------------------------------- + +// NB: argc and argv may be changed here, pass by reference! +int wxEntryStart( int& argc, char *argv[] ) { - wxDELETE(wxTheColourDatabase); - wxDELETE(wxTheFontNameDirectory); - wxDeleteStockObjects(); +#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( "wxWindows warning: GUI threading disabled due to outdated GTK version\n" ); + } + else + { + g_thread_init(NULL); + } +#endif - wxFlushResources(); + gtk_set_locale(); - wxDELETE(wxTheResourceCache); + // 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 + if (!wxOKlibc()) wxConvCurrent = &wxConvLocal; +#endif +#else + if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; +#endif - wxDeleteStockLists(); + gdk_threads_enter(); - wxCleanUpResourceSystem(); + gtk_init( &argc, &argv ); - wxImage::CleanUpHandlers(); + wxSetDetectableAutoRepeat( TRUE ); - wxSystemSettings::Done(); + if (!wxApp::Initialize()) + { + gdk_threads_leave(); + return -1; + } + + return 0; } -wxLog *wxApp::CreateLogTarget() + +int wxEntryInitGui() { - return new wxLogGui; + int retValue = 0; + + if ( !wxTheApp->OnInitGui() ) + retValue = -1; + + wxGetRootWindow(); + + return retValue; } -//----------------------------------------------------------------------------- -// wxEntry -//----------------------------------------------------------------------------- -int wxEntry( int argc, char *argv[] ) +void wxEntryCleanup() { - wxBuffer = new char[BUFSIZ + 512]; +#if wxUSE_LOG + // flush the logged messages if any + wxLog *log = wxLog::GetActiveTarget(); + if (log != NULL && log->HasPendingMessages()) + log->Flush(); - wxClassInfo::InitializeClasses(); + // continuing to use user defined log target is unsafe from now on because + // some resources may be already unavailable, so replace it by something + // more safe + wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr); + if ( oldlog ) + delete oldlog; +#endif // wxUSE_LOG - /* Debug stream no longer used -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + wxApp::CleanUp(); - streambuf* sBuf = new wxDebugStreamBuf; - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); + gdk_threads_leave(); +} + + +int wxEntry( int argc, char *argv[] ) +{ +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + // This seems to be necessary since there are 'rogue' + // objects present at this point (perhaps global objects?) + // Setting a checkpoint will ignore them as far as the + // memory checking facility is concerned. + // Of course you may argue that memory allocated in globals should be + // checked, but this is a reasonable compromise. + wxDebugContext::SetCheckpoint(); #endif -*/ + int err = wxEntryStart(argc, argv); + if (err) + return err; if (!wxTheApp) { - if (!wxApp::GetInitializerFunction()) - { - printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); - return 0; - } + wxCHECK_MSG( wxApp::GetInitializerFunction(), -1, + wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); @@ -396,93 +751,127 @@ int wxEntry( int argc, char *argv[] ) wxTheApp = (wxApp*) test_app; } - if (!wxTheApp) - { - printf( "wxWindows error: wxTheApp == NULL\n" ); - return 0; - } + wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") ); wxTheApp->argc = argc; +#if wxUSE_UNICODE + wxTheApp->argv = new wxChar*[argc+1]; + int mb_argc = 0; + while (mb_argc < argc) + { + wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc])); + mb_argc++; + } + wxTheApp->argv[mb_argc] = (wxChar *)NULL; +#else wxTheApp->argv = argv; +#endif - char name[200]; - strcpy( name, argv[0] ); - strcpy( name, wxFileNameFromPath(name) ); + wxString name(wxFileNameFromPath(argv[0])); wxStripExtension( name ); wxTheApp->SetAppName( name ); - gtk_set_locale(); - - gtk_init( &argc, &argv ); + int retValue; + retValue = wxEntryInitGui(); - GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); - - for (int i = 0; i < 64; i++) + // Here frames insert themselves automatically into wxTopLevelWindows by + // getting created in OnInit(). + if ( retValue == 0 ) { - 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 ( !wxTheApp->OnInit() ) + retValue = -1; } - gtk_widget_push_colormap( cmap ); - - gtk_widget_set_default_colormap( cmap ); + if ( retValue == 0 ) + { + /* delete pending toplevel windows (typically a single + dialog) so that, if there isn't any left, we don't + call OnRun() */ + wxTheApp->DeletePendingObjects(); - wxApp::CommonInit(); + wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) return FALSE; + if (wxTheApp->Initialized()) + { + wxTheApp->OnRun(); + + wxWindow *topWindow = wxTheApp->GetTopWindow(); + if (topWindow) + { + /* Forcibly delete the window. */ + if (topWindow->IsKindOf(CLASSINFO(wxFrame)) || + topWindow->IsKindOf(CLASSINFO(wxDialog)) ) + { + topWindow->Close( TRUE ); + wxTheApp->DeletePendingObjects(); + } + else + { + delete topWindow; + wxTheApp->SetTopWindow( (wxWindow*) NULL ); + } + } + + retValue = wxTheApp->OnExit(); + } + } - wxTheApp->OnInitGui(); + wxEntryCleanup(); - // Here frames insert themselves automatically - // into wxTopLevelWindows by getting created - // in OnInit(). + return retValue; +} - if (!wxTheApp->OnInit()) return 0; +#ifndef __WXUNIVERSAL__ - wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); +// XPM hack: make the arrays const +#define static static const - int retValue = 0; +#include "wx/gtk/info.xpm" +#include "wx/gtk/error.xpm" +#include "wx/gtk/question.xpm" +#include "wx/gtk/warning.xpm" - if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun(); +#undef static - wxTheApp->DeletePendingObjects(); +wxIcon wxApp::GetStdIcon(int which) const +{ + switch(which) + { + case wxICON_INFORMATION: + return wxIcon(info_xpm); - wxTheApp->OnExit(); + case wxICON_QUESTION: + return wxIcon(question_xpm); - wxModule::CleanUpModules(); + case wxICON_EXCLAMATION: + return wxIcon(warning_xpm); - wxApp::CommonCleanUp(); + default: + wxFAIL_MSG(wxT("requested non existent standard icon")); + // still fall through - delete wxTheApp; - wxTheApp = (wxApp*) NULL; - - wxClassInfo::CleanUpClasses(); - - delete[] wxBuffer; + case wxICON_HAND: + return wxIcon(error_xpm); + } +} +#else +wxIcon wxApp::GetStdIcon(int which) const +{ + return wxTheme::Get()->GetRenderer()->GetStdIcon(which); +} +#endif // !__WXUNIVERSAL__ -#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - if (wxDebugContext::CountObjectsLeft() > 0) - { - wxLogDebug("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } -// wxDebugContext::SetStream(NULL, NULL); +#ifdef __WXDEBUG__ -#endif +void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) +{ + m_isInAssert = TRUE; - wxLog *oldLog = wxLog::SetActiveTarget( NULL ); - if (oldLog) delete oldLog; + wxAppBase::OnAssert(file, line, msg); - return retValue; + m_isInAssert = FALSE; } -//----------------------------------------------------------------------------- +#endif // __WXDEBUG__