X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e38638c3499c679f25ec0029931aad8e62e70d3..d67fc8b73514909eb198223333e11be4d900f431:/src/gtk/app.cpp diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index 2041a588a7..72dd08db41 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -33,6 +33,10 @@ #include #endif // wxUSE_LIBHILDON +#if wxUSE_LIBHILDON2 + #include +#endif // wxUSE_LIBHILDON2 + #include //----------------------------------------------------------------------------- @@ -44,70 +48,6 @@ wxFORCE_LINK_MODULE(gnome_vfs) #endif -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -static GtkWidget *gs_RootWindow = (GtkWidget*) NULL; - -//----------------------------------------------------------------------------- -// wxYield -//----------------------------------------------------------------------------- - -// not static because used by textctrl.cpp -// -// MT-FIXME -bool wxIsInsideYield = false; - -bool wxApp::Yield(bool onlyIfNeeded) -{ - 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; - -#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 (EventsPending()) - 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; -} - //----------------------------------------------------------------------------- // local functions //----------------------------------------------------------------------------- @@ -120,9 +60,9 @@ wx_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data) wxApp* app = wxTheApp; if (app != NULL) app->WakeUpIdle(); - gulong* hook_id = (gulong*)data; + bool* hook_installed = (bool*)data; // record that hook is not installed - *hook_id = 0; + *hook_installed = false; // remove hook return false; } @@ -133,28 +73,30 @@ static void wx_add_idle_hooks() { // "event" hook { - static gulong hook_id = 0; - if (hook_id == 0) + static bool hook_installed; + if (!hook_installed) { - static guint sig_id = 0; + static guint sig_id; if (sig_id == 0) sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET); - hook_id = g_signal_add_emission_hook( - sig_id, 0, wx_emission_hook, &hook_id, NULL); + hook_installed = true; + g_signal_add_emission_hook( + sig_id, 0, wx_emission_hook, &hook_installed, NULL); } } // "size_allocate" hook // Needed to match the behavior of the old idle system, // but probably not necessary. { - static gulong hook_id = 0; - if (hook_id == 0) + static bool hook_installed; + if (!hook_installed) { - static guint sig_id = 0; + static guint sig_id; if (sig_id == 0) sig_id = g_signal_lookup("size_allocate", GTK_TYPE_WIDGET); - hook_id = g_signal_add_emission_hook( - sig_id, 0, wx_emission_hook, &hook_id, NULL); + hook_installed = true; + g_signal_add_emission_hook( + sig_id, 0, wx_emission_hook, &hook_installed, NULL); } } } @@ -174,12 +116,13 @@ bool wxApp::DoIdle() // Needed if an idle event handler runs a new event loop, // for example by showing a dialog. #if wxUSE_THREADS - wxMutexLocker lock(*m_idleMutex); + wxMutexLocker lock(m_idleMutex); #endif id_save = m_idleSourceId; m_idleSourceId = 0; wx_add_idle_hooks(); -#ifdef __WXDEBUG__ + +#if wxDEBUG_LEVEL // don't generate the idle events while the assert modal dialog is shown, // this matches the behavior of wxMSW if (m_isInAssert) @@ -190,12 +133,14 @@ bool wxApp::DoIdle() gdk_threads_enter(); bool needMore; do { + ProcessPendingEvents(); + needMore = ProcessIdle(); } while (needMore && gtk_events_pending() == 0); gdk_threads_leave(); #if wxUSE_THREADS - wxMutexLocker lock(*m_idleMutex); + wxMutexLocker lock(m_idleMutex); #endif // if a new idle source was added during ProcessIdle if (m_idleSourceId != 0) @@ -207,7 +152,8 @@ bool wxApp::DoIdle() // Pending events can be added asynchronously, // need to keep idle source if any have appeared - needMore = needMore || HasPendingEvents(); + if (HasPendingEvents()) + needMore = true; // if more idle processing requested if (needMore) @@ -227,12 +173,14 @@ bool wxApp::DoIdle() GtkWidget* wxGetRootWindow() { - if (gs_RootWindow == NULL) + static GtkWidget *s_RootWindow = NULL; + + if (s_RootWindow == NULL) { - gs_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_realize( gs_RootWindow ); + s_RootWindow = gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_realize( s_RootWindow ); } - return gs_RootWindow; + return s_RootWindow; } //----------------------------------------------------------------------------- @@ -243,12 +191,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxApp,wxEvtHandler) wxApp::wxApp() { -#ifdef __WXDEBUG__ m_isInAssert = false; -#endif // __WXDEBUG__ -#if wxUSE_THREADS - m_idleMutex = NULL; -#endif m_idleSourceId = 0; } @@ -323,33 +266,17 @@ bool wxApp::OnInitGui() } } -#if wxUSE_LIBHILDON - m_hildonProgram = hildon_program_get_instance(); - if ( !m_hildonProgram ) +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 + if ( !GetHildonProgram() ) { wxLogError(_("Unable to initialize Hildon program")); return false; } -#endif // wxUSE_LIBHILDON +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 return true; } -GdkVisual *wxApp::GetGdkVisual() -{ - GdkVisual *visual = NULL; - - XVisualInfo *xvi = (XVisualInfo *)GetXVisualInfo(); - if ( xvi ) - visual = gdkx_visual_get( xvi->visualid ); - else - visual = gdk_drawable_get_visual( wxGetRootWindow()->window ); - - wxASSERT( visual ); - - return visual; -} - // use unusual names for the parameters to avoid conflict with wxApp::arg[cv] bool wxApp::Initialize(int& argc_, wxChar **argv_) { @@ -371,9 +298,9 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_) // (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"))); - encName = encName.BeforeFirst(_T(',')); - if (encName.CmpNoCase(_T("@locale")) == 0) + wxString encName(wxGetenv(wxT("G_FILENAME_ENCODING"))); + encName = encName.BeforeFirst(wxT(',')); + if (encName.CmpNoCase(wxT("@locale")) == 0) encName.clear(); encName.MakeUpper(); #if wxUSE_INTL @@ -383,13 +310,13 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_) // 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); + if (encName.empty() || encName == wxT("US-ASCII")) + encName = wxT("UTF-8"); + wxSetEnv(wxT("G_FILENAME_ENCODING"), encName); } #else if (encName.empty()) - encName = _T("UTF-8"); + encName = wxT("UTF-8"); // if wxUSE_INTL==0 it probably indicates that only "C" locale is supported // by the program anyhow so prevent GTK+ from calling setlocale(LC_ALL, "") @@ -498,15 +425,10 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_) // we can not enter threads before gtk_init is done gdk_threads_enter(); - wxSetDetectableAutoRepeat( true ); - #if wxUSE_INTL wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding()); #endif -#if wxUSE_THREADS - m_idleMutex = new wxMutex; -#endif // make sure GtkWidget type is loaded, idle hooks need it g_type_class_ref(GTK_TYPE_WIDGET); WakeUpIdle(); @@ -525,20 +447,12 @@ void wxApp::CleanUp() gdk_threads_leave(); wxAppBase::CleanUp(); - - // delete this mutex as late as possible as it's used from WakeUpIdle(), in - // particular do it after calling the base class CleanUp() which can result - // in it being called -#if wxUSE_THREADS - delete m_idleMutex; - m_idleMutex = NULL; -#endif } void wxApp::WakeUpIdle() { #if wxUSE_THREADS - wxMutexLocker lock(*m_idleMutex); + wxMutexLocker lock(m_idleMutex); #endif if (m_idleSourceId == 0) m_idleSourceId = g_idle_add_full(G_PRIORITY_LOW, wxapp_idle_callback, NULL, NULL); @@ -549,7 +463,7 @@ void wxApp::WakeUpIdle() bool wxApp::EventsPending() { #if wxUSE_THREADS - wxMutexLocker lock(*m_idleMutex); + wxMutexLocker lock(m_idleMutex); #endif if (m_idleSourceId != 0) { @@ -560,25 +474,30 @@ bool wxApp::EventsPending() return gtk_events_pending() != 0; } -#ifdef __WXDEBUG__ - void wxApp::OnAssertFailure(const wxChar *file, int line, const wxChar* func, const wxChar* cond, const wxChar *msg) { - + // there is no need to do anything if asserts are disabled in this build + // anyhow +#if wxDEBUG_LEVEL // block wx idle events while assert dialog is showing m_isInAssert = true; wxAppBase::OnAssertFailure(file, line, func, cond, msg); m_isInAssert = false; +#else // !wxDEBUG_LEVEL + wxUnusedVar(file); + wxUnusedVar(line); + wxUnusedVar(func); + wxUnusedVar(cond); + wxUnusedVar(msg); +#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL } -#endif // __WXDEBUG__ - #if wxUSE_THREADS void wxGUIAppTraits::MutexGuiEnter() { @@ -590,3 +509,12 @@ void wxGUIAppTraits::MutexGuiLeave() gdk_threads_leave(); } #endif // wxUSE_THREADS + +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 +// Maemo-specific method: get the main program object +HildonProgram *wxApp::GetHildonProgram() +{ + return hildon_program_get_instance(); +} + +#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2