X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/158949492d68bd0e98fab14dabcc3fa6f6924a6d..1fe0a566bbf649efe7cadc21e8ded82458c8bdc6:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index c3e76d4158..1cef9c3ee5 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.cpp +// Name: src/gtk/app.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -17,15 +17,19 @@ #include "wx/wxprec.h" #include "wx/app.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" +#endif + #include "wx/gdicmn.h" -#include "wx/utils.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" @@ -33,7 +37,7 @@ #include "wx/thread.h" #ifdef __WXGPE__ -#include + #include #endif #ifdef __WXUNIVERSAL__ @@ -41,10 +45,6 @@ #include "wx/univ/renderer.h" #endif -#if wxUSE_THREADS - #include "wx/thread.h" -#endif - #include #ifdef HAVE_POLL @@ -74,14 +74,24 @@ #include "wx/unix/private.h" #include "wx/gtk/win_gtk.h" +#include "wx/gtk/private.h" -#include +#include + +//----------------------------------------------------------------------------- +// link GnomeVFS +//----------------------------------------------------------------------------- + +#if wxUSE_LIBGNOMEVFS +#include "wx/html/forcelnk.h" +FORCE_LINK(gnome_vfs) +#endif //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -bool g_mainThreadLocked = FALSE; +bool g_mainThreadLocked = false; gint g_pendingTag = 0; static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; @@ -90,8 +100,6 @@ static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; // idle system //----------------------------------------------------------------------------- -extern bool g_isIdle; - void wxapp_install_idle_handler(); #if wxUSE_THREADS @@ -105,7 +113,7 @@ static wxMutex gs_idleTagsMutex; // not static because used by textctrl.cpp // // MT-FIXME -bool wxIsInsideYield = FALSE; +bool wxIsInsideYield = false; bool wxApp::Yield(bool onlyIfNeeded) { @@ -116,18 +124,18 @@ bool wxApp::Yield(bool onlyIfNeeded) wxFAIL_MSG( wxT("wxYield called recursively" ) ); } - return FALSE; + return false; } #if wxUSE_THREADS if ( !wxThread::IsMain() ) { // can't call gtk_main_iteration() from other threads like this - return TRUE; + return true; } #endif // wxUSE_THREADS - wxIsInsideYield = TRUE; + wxIsInsideYield = true; // We need to remove idle callbacks or the loop will // never finish. @@ -155,9 +163,9 @@ bool wxApp::Yield(bool onlyIfNeeded) wxLog::Resume(); #endif - wxIsInsideYield = FALSE; + wxIsInsideYield = false; - return TRUE; + return true; } //----------------------------------------------------------------------------- @@ -245,21 +253,22 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) ) #if wxUSE_THREADS wxMutexLocker lock(gs_idleTagsMutex); #endif - g_isIdle = TRUE; + g_isIdle = true; wxTheApp->m_idleTag = 0; } + bool moreIdles; + // 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)) + while ( (moreIdles = 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; + // Return FALSE if no more idle events are to be sent + return moreIdles; } #if wxUSE_THREADS @@ -335,14 +344,14 @@ static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) gdk_threads_enter(); wxMutexGuiLeave(); - g_mainThreadLocked = TRUE; + 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; + g_mainThreadLocked = false; gdk_threads_leave(); @@ -371,17 +380,17 @@ void wxapp_install_idle_handler() wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") ); - g_isIdle = FALSE; + g_isIdle = false; if (g_pendingTag == 0) - g_pendingTag = gtk_idle_add_priority( 900, wxapp_pending_callback, (gpointer) NULL ); + g_pendingTag = g_idle_add_full( 900, wxapp_pending_callback, NULL, 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 ); + wxTheApp->m_idleTag = g_idle_add_full( 1000, wxapp_idle_callback, NULL, NULL ); } //----------------------------------------------------------------------------- @@ -411,11 +420,11 @@ END_EVENT_TABLE() wxApp::wxApp() { #ifdef __WXDEBUG__ - m_isInAssert = FALSE; + m_isInAssert = false; #endif // __WXDEBUG__ m_idleTag = 0; - g_isIdle = TRUE; + g_isIdle = true; wxapp_install_idle_handler(); #if wxUSE_THREADS @@ -431,15 +440,17 @@ wxApp::wxApp() wxApp::~wxApp() { - if (m_idleTag) gtk_idle_remove( m_idleTag ); + if (m_idleTag) + g_source_remove( m_idleTag ); - if (m_colorCube) free(m_colorCube); + if (m_colorCube) + free(m_colorCube); } bool wxApp::OnInitGui() { if ( !wxAppBase::OnInitGui() ) - return FALSE; + return false; GdkVisual *visual = gdk_visual_get_system(); @@ -472,7 +483,7 @@ bool wxApp::OnInitGui() } // Nothing to do for 15, 16, 24, 32 bit displays - if (visual->depth > 8) return TRUE; + if (visual->depth > 8) return true; // initialize color cube for 8-bit color reduction dithering @@ -522,7 +533,7 @@ bool wxApp::OnInitGui() } } - return TRUE; + return true; } GdkVisual *wxApp::GetGdkVisual() @@ -532,7 +543,7 @@ GdkVisual *wxApp::GetGdkVisual() if (m_glVisualInfo) visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); else - visual = gdk_window_get_visual( wxGetRootWindow()->window ); + visual = gdk_drawable_get_visual( wxGetRootWindow()->window ); wxASSERT( visual ); @@ -544,18 +555,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv) bool init_result; #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); - } + if (!g_thread_supported()) + g_thread_init(NULL); #endif // wxUSE_THREADS gtk_set_locale(); @@ -659,7 +660,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv) return false; } - wxSetDetectableAutoRepeat( TRUE ); + wxSetDetectableAutoRepeat( true ); #if wxUSE_INTL wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); @@ -679,11 +680,11 @@ void wxApp::CleanUp() void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg) { - m_isInAssert = TRUE; + m_isInAssert = true; wxAppBase::OnAssert(file, line, cond, msg); - m_isInAssert = FALSE; + m_isInAssert = false; } #endif // __WXDEBUG__ @@ -695,8 +696,8 @@ void wxApp::RemoveIdleTag() #endif if (!g_isIdle) { - gtk_idle_remove( wxTheApp->m_idleTag ); + g_source_remove( wxTheApp->m_idleTag ); wxTheApp->m_idleTag = 0; - g_isIdle = TRUE; + g_isIdle = true; } }