X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c2fa61e833ffe9789ef3d3327157e17101a4a2ce..df16a53ef9ae506c51023178e4fe45ce45e69447:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 07fadb9ea6..0ef365ec05 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -28,17 +28,20 @@ #include "wx/module.h" #include "wx/image.h" +#ifdef __WXUNIVERSAL__ + #include "wx/univ/theme.h" + #include "wx/univ/renderer.h" +#endif + #if wxUSE_THREADS #include "wx/thread.h" #endif #include +#include "wx/gtk/win_gtk.h" -#include -#include #include -#include "wx/gtk/win_gtk.h" //----------------------------------------------------------------------------- // global data @@ -80,10 +83,21 @@ void wxExit() // wxYield //----------------------------------------------------------------------------- -static bool gs_inYield = FALSE; - -bool wxYield() +bool wxApp::Yield(bool onlyIfNeeded) { + // 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() ) { @@ -92,55 +106,39 @@ bool wxYield() } #endif // wxUSE_THREADS -#ifdef __WXDEBUG__ - if (gs_inYield) - wxFAIL_MSG( wxT("wxYield called recursively" ) ); -#endif - - gs_inYield = TRUE; + s_inYield = TRUE; if (!g_isIdle) { // We need to remove idle callbacks or the loop will // never finish. - gtk_idle_remove( wxTheApp->m_idleTag ); - wxTheApp->m_idleTag = 0; + gtk_idle_remove( m_idleTag ); + m_idleTag = 0; g_isIdle = TRUE; } - while (gtk_events_pending()) - gtk_main_iteration(); - // 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) */ - while (wxTheApp->ProcessIdle()) { } + while ( ProcessIdle() ) + { + } // let the logs be flashed again wxLog::Resume(); - gs_inYield = FALSE; + s_inYield = FALSE; return TRUE; } -//----------------------------------------------------------------------------- -// wxYieldIfNeeded -// Like wxYield, but fails silently if the yield is recursive. -//----------------------------------------------------------------------------- - -bool wxYieldIfNeeded() -{ - if (gs_inYield) - return FALSE; - - return wxYield(); -} - //----------------------------------------------------------------------------- // wxWakeUpIdle //----------------------------------------------------------------------------- @@ -194,7 +192,18 @@ gint wxapp_pending_callback( gpointer WXUNUSED(data) ) gint wxapp_idle_callback( gpointer WXUNUSED(data) ) { - if (!wxTheApp) return TRUE; + 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 @@ -209,8 +218,9 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) ) g_isIdle = TRUE; wxTheApp->m_idleTag = 0; - // Sent idle event to all who request them - while (wxTheApp->ProcessIdle()) { } + // Sent idle event to all who request them as long as they do + while (wxTheApp->ProcessIdle()) + ; // Release lock again gdk_threads_leave(); @@ -309,10 +319,10 @@ END_EVENT_TABLE() wxApp::wxApp() { - wxTheApp = this; - - m_topWindow = (wxWindow *) NULL; - m_exitOnFrameDelete = TRUE; + m_initialized = FALSE; +#ifdef __WXDEBUG__ + m_isInAssert = FALSE; +#endif // __WXDEBUG__ m_idleTag = 0; wxapp_install_idle_handler(); @@ -323,8 +333,9 @@ wxApp::wxApp() #endif m_colorCube = (unsigned char*) NULL; - - m_useBestVisual = FALSE; + + // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp + m_glVisualInfo = (void *) NULL; } wxApp::~wxApp() @@ -340,13 +351,34 @@ wxApp::~wxApp() bool wxApp::OnInitGui() { + 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, of course, but what do these guys pay $30.000 for? */ - if ((gdk_visual_get_best() != gdk_visual_get_system()) && + else if ((gdk_visual_get_best() != gdk_visual_get_system()) && (m_useBestVisual)) { #ifdef __WXGTK20__ @@ -549,6 +581,10 @@ bool wxApp::Initialize() wxClassInfo::InitializeClasses(); wxSystemSettings::Init(); + +#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. @@ -823,13 +859,14 @@ int wxEntry( int argc, char *argv[] ) return retValue; } +#ifndef __WXUNIVERSAL__ + #include "wx/gtk/info.xpm" #include "wx/gtk/error.xpm" #include "wx/gtk/question.xpm" #include "wx/gtk/warning.xpm" -wxIcon -wxApp::GetStdIcon(int which) const +wxIcon wxApp::GetStdIcon(int which) const { switch(which) { @@ -850,3 +887,24 @@ wxApp::GetStdIcon(int which) const return wxIcon(error_xpm); } } +#else +wxIcon wxApp::GetStdIcon(int which) const +{ + return wxTheme::Get()->GetRenderer()->GetStdIcon(which); +} +#endif // !__WXUNIVERSAL__ + + +#ifdef __WXDEBUG__ + +void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) +{ + m_isInAssert = TRUE; + + wxAppBase::OnAssert(file, line, msg); + + m_isInAssert = FALSE; +} + +#endif // __WXDEBUG__ +