X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56465170cc4b3ba3a12d70ab51f0256cc1d02525..37ddd6ea64d7faae1201740ea5f6eb7050189611:/src/gtk/utilsgtk.cpp diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index a87e1c321e..76a2c7fa8c 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -119,7 +119,7 @@ void wxDisplaySizeMM( int *width, int *height ) void wxGetMousePosition( int* x, int* y ) { - gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL ); + gdk_window_get_pointer( NULL, x, y, NULL ); } bool wxColourDisplay() @@ -213,50 +213,22 @@ const gchar *wx_pango_version_check (int major, int minor, int micro) extern "C" { static void GTK_EndProcessDetector(gpointer data, gint source, - GdkInputCondition WXUNUSED(condition) ) + GdkInputCondition WXUNUSED(condition)) { - wxEndProcessData *proc_data = (wxEndProcessData *)data; + wxEndProcessData * const + proc_data = static_cast(data); - // has the process really terminated? unfortunately GDK (or GLib) seem to - // generate G_IO_HUP notification even when it simply tries to read from a - // closed fd and hasn't terminated at all - int pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid); - int status = 0; - int rc = waitpid(pid, &status, WNOHANG); + // child exited, end waiting + close(source); - if ( rc == 0 ) - { - // This can only happen if the child application closes our dummy - // pipe that is used to monitor its lifetime; in that case, our - // best bet is to pretend the process did terminate, because - // otherwise wxExecute() would hang indefinitely - // (OnExceptionWaiting() won't be called again, the descriptor - // is closed now). - wxLogDebug("Child process (PID %i) still alive, even though notification was received that it terminated.", pid); - } - else if ( rc == -1 ) - { - // As above, if waitpid() fails, the best we can do is to log the - // error and pretend the child terminated: - wxLogSysError(_("Failed to check child process' status")); - } - - // set exit code to -1 if something bad happened - proc_data->exitcode = (rc > 0 && WIFEXITED(status)) - ? WEXITSTATUS(status) - : -1; - - // child exited, end waiting - close(source); + // don't call us again! + gdk_input_remove(proc_data->tag); - // don't call us again! - gdk_input_remove(proc_data->tag); - - wxHandleProcessTermination(proc_data); + wxHandleProcessTermination(proc_data); } } -int wxAddProcessCallback(wxEndProcessData *proc_data, int fd) +int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd) { int tag = gdk_input_add(fd, GDK_INPUT_READ, @@ -318,7 +290,7 @@ static wxString GetSM() if ( !smc_conn ) { - wxLogWarning(_("Failed to connect to session manager: %s"), smerr); + wxLogDebug("Failed to connect to session manager: %s", smerr); return wxEmptyString; } @@ -476,7 +448,9 @@ wxString wxGUIAppTraits::GetDesktopEnvironment() const // see the hack below in wxCmdLineParser::GetUsageString(). // TODO: replace this hack with a g_option_group_get_entries() -// call as soon as such function exists +// call as soon as such function exists; +// see http://bugzilla.gnome.org/show_bug.cgi?id=431021 for the relative +// feature request struct _GOptionGroup { gchar *name; @@ -526,36 +500,40 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names, wxString usage; #ifdef __WXGTK26__ - // check whether GTK version is greater than 2.6 but also lower than 2.12 - // because, as we use the undocumented _GOptionGroup struct, we don't want - // to run this code with future versions which might change it (2.11 is the - // latest one at the time of this writing) - if (!gtk_check_version(2,6,0) && - gtk_check_version(2,12,0)) + if (!gtk_check_version(2,6,0)) { - usage << _("The following standard GTK+ options are also supported:\n"); + // since GTK>=2.6, we can use the glib_check_version() symbol... - // passing true here means that the function can open the default - // display while parsing (not really used here anyhow) - GOptionGroup *gtkOpts = gtk_get_option_group(true); + // check whether GLib version is greater than 2.6 but also lower than 2.19 + // because, as we use the undocumented _GOptionGroup struct, we don't want + // to run this code with future versions which might change it (2.19 is the + // latest one at the time of this writing) + if (!glib_check_version(2,6,0) && glib_check_version(2,19,0)) + { + usage << _("The following standard GTK+ options are also supported:\n"); - // WARNING: here we access the internals of GOptionGroup: - GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries; - unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries; - wxArrayString namesOptions, descOptions; + // passing true here means that the function can open the default + // display while parsing (not really used here anyhow) + GOptionGroup *gtkOpts = gtk_get_option_group(true); - for ( size_t n = 0; n < n_entries; n++ ) - { - if ( entries[n].flags & G_OPTION_FLAG_HIDDEN ) - continue; // skip + // WARNING: here we access the internals of GOptionGroup: + GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries; + unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries; + wxArrayString namesOptions, descOptions; - names.push_back(wxGetNameFromGtkOptionEntry(&entries[n])); + for ( size_t n = 0; n < n_entries; n++ ) + { + if ( entries[n].flags & G_OPTION_FLAG_HIDDEN ) + continue; // skip - const gchar * const entryDesc = entries[n].description; - desc.push_back(entryDesc ? wxString(entryDesc) : _T("")); - } + names.push_back(wxGetNameFromGtkOptionEntry(&entries[n])); + + const gchar * const entryDesc = entries[n].description; + desc.push_back(wxString(entryDesc)); + } - g_option_group_free (gtkOpts); + g_option_group_free (gtkOpts); + } } #else wxUnusedVar(names);