X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60acb9473f3e488fa4ced557489dd48149dd510c..1b3667ab28da7b78b49813b99047221e03a69b62:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index c6fc8d44d9..e3bb20d00d 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -8,7 +8,7 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "app.h" + #pragma implementation "app.h" #endif #include "wx/app.h" @@ -20,35 +20,24 @@ #include "wx/font.h" #include "wx/settings.h" #include "wx/dialog.h" + #if wxUSE_WX_RESOURCES -#include "wx/resource.h" + #include "wx/resource.h" #endif + #include "wx/module.h" #include "wx/image.h" -#if wxUSE_THREADS + #include "wx/thread.h" -#endif + #include "unistd.h" -// many versions of Unices have this function, but it is not defined in system -// headers - please add your system here if it is the case for your OS. -// SunOS < 5.6 (i.e. Solaris < 2.6) and DG-UX are like this. -#if (defined(__SUN__) && !defined(__SunOs_5_6) && \ - !defined(__SunOs_5_7) && !defined(__SUNPRO_CC)) || \ - defined(__osf__) - extern "C" - { - void usleep(unsigned long usec); - }; -#endif // Unices without usleep() +#include +#include +#include -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" #include "wx/gtk/win_gtk.h" -#include // usleep() on solaris - //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- @@ -57,6 +46,10 @@ wxApp *wxTheApp = (wxApp *) NULL; wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; extern wxList wxPendingDelete; +#if wxUSE_THREADS +extern wxList *wxPendingEvents; +extern wxCriticalSection *wxPendingEventsLocker; +#endif extern wxResourceCache *wxTheResourceCache; unsigned char g_palette[64*3] = @@ -142,9 +135,30 @@ void wxExit() gtk_main_quit(); } +// forward decl +gint wxapp_idle_callback( gpointer WXUNUSED(data) ); + bool wxYield() { - while (gtk_events_pending() > 0) 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) + for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst(); + node; + node = node->GetNext() ) + { + wxWindow *win = node->GetData(); + win->OnInternalIdle(); + } + + // We need to temporarily remove idle callbacks or the loop will + // never finish. + gtk_idle_remove( wxTheApp->m_idleTag ); + + while (gtk_events_pending()) + gtk_main_iteration(); + + wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL ); return TRUE; } @@ -160,14 +174,17 @@ END_EVENT_TABLE() gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { - if (wxTheApp) while (wxTheApp->ProcessIdle()) {} -#if wxUSE_THREADS + if (wxTheApp) + { + while (wxTheApp->ProcessIdle()) + { + } + } + wxMutexGuiLeave(); -#endif - usleep(10000); -#if wxUSE_THREADS + wxUsleep(10); wxMutexGuiEnter(); -#endif + return TRUE; } @@ -202,7 +219,7 @@ bool wxApp::OnInitGui() use the same 64 colormap entries on 8-bit displays so you can use several rather graphics-heavy applications at the same time. - NOTE: this doesn't really seem to work this way... */ + NOTE: this doesn't really seem to work this way... */ /* GdkColormap *cmap = gdk_colormap_new( gdk_visual_get_system(), TRUE ); @@ -229,13 +246,13 @@ bool wxApp::OnInitGui() 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); + 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); GdkColor *colors = cmap->colors; int max = 3 * (65536); @@ -250,9 +267,9 @@ bool wxApp::OnInitGui() if (sum < max) { index = i; max = sum; } } - m_colorCube[ (r*1024) + (g*32) + b ] = index; - } - } + m_colorCube[ (r*1024) + (g*32) + b ] = index; + } + } } @@ -278,6 +295,12 @@ void wxApp::OnIdle( wxIdleEvent &event ) inOnIdle = TRUE; +#if wxUSE_THREADS + /* Resend in the main thread events which have been prepared in other + threads */ + ProcessPendingEvents(); +#endif + /* 'Garbage' collection of windows deleted with Close(). */ DeletePendingObjects(); @@ -299,14 +322,15 @@ 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; } @@ -354,12 +378,32 @@ bool wxApp::Initialized() bool wxApp::Pending() { - return FALSE; + return gtk_events_pending(); } void wxApp::Dispatch() { + gtk_main_iteration(); +} + +#if wxUSE_THREADS +void wxApp::ProcessPendingEvents() +{ + wxNode *node = wxPendingEvents->First(); + wxCriticalSectionLocker locker(*wxPendingEventsLocker); + + while (node) + { + wxEvtHandler *handler = (wxEvtHandler *)node->Data(); + + handler->ProcessPendingEvents(); + + delete node; + + node = wxPendingEvents->First(); + } } +#endif // wxUSE_THREADS void wxApp::DeletePendingObjects() { @@ -379,10 +423,12 @@ void wxApp::DeletePendingObjects() wxWindow *wxApp::GetTopWindow() { - if (m_topWindow) return m_topWindow; - wxNode *node = wxTopLevelWindows.First(); - if (!node) return (wxWindow *) NULL; - return (wxWindow*)node->Data(); + if (m_topWindow) + return m_topWindow; + else if (wxTopLevelWindows.GetCount() > 0) + return wxTopLevelWindows.GetFirst()->GetData(); + else + return NULL; } void wxApp::SetTopWindow( wxWindow *win ) @@ -392,12 +438,19 @@ void wxApp::SetTopWindow( wxWindow *win ) bool wxApp::Initialize() { - wxBuffer = new char[BUFSIZ + 512]; + wxBuffer = new wxChar[BUFSIZ + 512]; wxClassInfo::InitializeClasses(); wxSystemSettings::Init(); + // 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 + /* wxTheFontNameDirectory = new wxFontNameDirectory; wxTheFontNameDirectory->Initialize(); @@ -458,6 +511,13 @@ void wxApp::CleanUp() delete wxTheApp; wxTheApp = (wxApp*) NULL; + // 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 + delete wxPendingEvents; + delete wxPendingEventsLocker; +#endif + wxSystemSettings::Done(); delete[] wxBuffer; @@ -468,11 +528,11 @@ void wxApp::CleanUp() #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT if (wxDebugContext::CountObjectsLeft() > 0) { - wxLogDebug("There were memory leaks.\n"); + wxLogDebug(_T("There were memory leaks.\n")); wxDebugContext::Dump(); wxDebugContext::PrintStatistics(); } -#endif +#endif // Debug // do this as the very last thing because everything else can log messages wxLog::DontCreateOnDemand(); @@ -503,7 +563,7 @@ int wxEntry( int argc, char *argv[] ) if (!wxTheApp) { wxCHECK_MSG( wxApp::GetInitializerFunction(), -1, - "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" ); + _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") ); wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction(); @@ -512,52 +572,54 @@ int wxEntry( int argc, char *argv[] ) wxTheApp = (wxApp*) test_app; } - wxCHECK_MSG( wxTheApp, -1, "wxWindows error: no application object" ); + wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") ); wxTheApp->argc = argc; wxTheApp->argv = argv; - char name[200]; - strcpy( name, argv[0] ); - strcpy( name, wxFileNameFromPath(name) ); + wxString name(wxFileNameFromPath(argv[0])); wxStripExtension( name ); wxTheApp->SetAppName( name ); - if (!wxTheApp->OnInitGui()) - return 0; - - /* Here frames insert themselves automatically - * into wxTopLevelWindows by getting created - * in OnInit(). */ + int retValue = 0; - if (!wxTheApp->OnInit()) - return 0; + if ( !wxTheApp->OnInitGui() ) + retValue = -1; - wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0); + // Here frames insert themselves automatically into wxTopLevelWindows by + // getting created in OnInit(). + if ( retValue == 0 ) + { + if ( !wxTheApp->OnInit() ) + retValue = -1; + } - int retValue = 0; + if ( retValue == 0 ) + { + wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0; - if (wxTheApp->Initialized()) - retValue = wxTheApp->OnRun(); + if (wxTheApp->Initialized()) + retValue = wxTheApp->OnRun(); - wxWindow *topWindow = wxTheApp->GetTopWindow(); - if (topWindow) - { - // Forcibly delete the window. - if (topWindow->IsKindOf(CLASSINFO(wxFrame)) || - topWindow->IsKindOf(CLASSINFO(wxDialog)) ) + wxWindow *topWindow = wxTheApp->GetTopWindow(); + if (topWindow) { - topWindow->Close( TRUE ); - wxTheApp->DeletePendingObjects(); + // 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 ); + } } - else - { - delete topWindow; - wxTheApp->SetTopWindow( (wxWindow*) NULL ); - } - } - wxTheApp->OnExit(); + wxTheApp->OnExit(); + } // flush the logged messages if any wxLog *log = wxLog::GetActiveTarget();