Preserve original menu label for later retrieval

[wxWidgets.git] / src / gtk / utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index f0808a23015d1564a680e02375f4ad68159d29ed..1f9ea333a74c9427a23cc32259467eb1d19d5c8e 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -1,71 +1,145 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        utils.cpp
+// Name:        src/gtk/utilsgtk.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:           wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-//#ifdef __GNUG__
-//#pragma implementation "utils.h"
-//#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/utils.h"
 
 #include "wx/utils.h"

-#include "wx/string.h"

 
 

-#include "wx/intl.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+
+#include "wx/apptrait.h"
+
+#include "wx/process.h"
+#include "wx/sysopt.h"
+
+#include "wx/unix/execute.h"
+
+#include "wx/gtk/private/timer.h"
+#include "wx/evtloop.h"
+
+#ifdef __WXDEBUG__
+    #include "wx/gtk/assertdlg_gtk.h"
+    #if wxUSE_STACKWALKER
+        #include "wx/stackwalk.h"
+    #endif // wxUSE_STACKWALKER
+#endif // __WXDEBUG__

 
 #include <stdarg.h>
 
 #include <stdarg.h>

-#include <dirent.h>

 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>

+#include <sys/wait.h>   // for WNOHANG

 #include <unistd.h>
 #include <unistd.h>

-#include <sys/wait.h>
-#include <pwd.h>
-#include <errno.h>
-#include <netdb.h>
-#include <signal.h>

 
 

-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xresource.h>
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gdk/gdkx.h"

 
 

-#include "gdk/gdkx.h"        // GDK_DISPLAY
+#ifdef HAVE_X11_XKBLIB_H
+    /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with
+     * field named "explicit" - which is, of course, an error for a C++
+     * compiler. To be on the safe side, just redefine it everywhere. */
+    #define explicit __wx_explicit

 
 

-#ifdef __SVR4__
-  #include <sys/systeminfo.h>
-#endif
+    #include "X11/XKBlib.h"

 
 

-#ifdef __SOLARIS__
-// somehow missing from sys/wait.h but in the system's docs
-extern "C"
-{
-   pid_t wait4(pid_t pid, int *statusp, int options, struct rusage
-               *rusage);
-}
+    #undef explicit
+#endif // HAVE_X11_XKBLIB_H
+
+
+#if wxUSE_DETECT_SM
+    #include "X11/Xlib.h"
+    #include "X11/SM/SMlib.h"

 #endif
 
 #endif
 

-//------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern GtkWidget *wxGetRootWindow();
+
+//----------------------------------------------------------------------------

 // misc.
 // misc.

-//------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+#ifndef __EMX__
+// on OS/2, we use the wxBell from wxBase library

 
 

-void wxBell(void)
+void wxBell()

 {
     gdk_beep();
 }
 {
     gdk_beep();
 }

+#endif

 
 

-void wxSleep(int nSecs)
+/* Don't synthesize KeyUp events holding down a key and producing
+   KeyDown events with autorepeat. */
+#ifdef HAVE_X11_XKBLIB_H
+bool wxSetDetectableAutoRepeat( bool flag )

 {
 {

-    sleep(nSecs);
+    Bool result;
+    XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
+    return result;       /* true if keyboard hardware supports this mode */

 }
 }

+#else
+bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
+{
+    return false;
+}
+#endif

 
 

-int wxKill(long pid, int sig)
+// Escapes string so that it is valid Pango markup XML string:
+wxString wxEscapeStringForPangoMarkup(const wxString& str)

 {
 {

-    return kill(pid, sig);
+    size_t len = str.length();
+    wxString out;
+    out.Alloc(len);
+    for (size_t i = 0; i < len; i++)
+    {
+        wxChar c = str[i];
+        switch (c)
+        {
+            case _T('&'):
+                out << _T("&amp;");
+                break;
+            case _T('<'):
+                out << _T("&lt;");
+                break;
+            case _T('>'):
+                out << _T("&gt;");
+                break;
+            case _T('\''):
+                out << _T("&apos;");
+                break;
+            case _T('"'):
+                out << _T("&quot;");
+                break;
+            default:
+                out << c;
+                break;
+        }
+    }
+    return out;
+}
+
+
+// ----------------------------------------------------------------------------
+// display characterstics
+// ----------------------------------------------------------------------------
+
+void *wxGetDisplay()
+{
+    return GDK_DISPLAY();

 }
 
 void wxDisplaySize( int *width, int *height )
 }
 
 void wxDisplaySize( int *width, int *height )


@@ -74,303 +148,452 @@ void wxDisplaySize( int *width, int *height )
     if (height) *height = gdk_screen_height();
 }
 
     if (height) *height = gdk_screen_height();
 }
 

-void wxGetMousePosition( int* x, int* y )
+void wxDisplaySizeMM( int *width, int *height )

 {
 {

-    Window       dumw;
-    int          dumi;
-    unsigned int dumu;
-    
-    XQueryPointer( GDK_DISPLAY(),GDK_ROOT_WINDOW(),
-                   &dumw,&dumw,x,y,&dumi,&dumi,&dumu );
+    if (width) *width = gdk_screen_width_mm();
+    if (height) *height = gdk_screen_height_mm();

 }
 
 }
 

-bool wxColourDisplay(void)
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)

 {
 {

-    wxFAIL_MSG( "wxColourDisplay always returns TRUE" );
-    return TRUE;
+    // This is supposed to return desktop dimensions minus any window
+    // manager panels, menus, taskbars, etc.  If there is a way to do that
+    // for this platform please fix this function, otherwise it defaults
+    // to the entire desktop.
+    if (x) *x = 0;
+    if (y) *y = 0;
+    wxDisplaySize(width, height);

 }
 
 }
 

-int wxDisplayDepth(void)
+void wxGetMousePosition( int* x, int* y )

 {
 {

-    wxFAIL_MSG( "wxDisplayDepth always returns 8" );
-    return 8;
+    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );

 }
 
 }
 

-//------------------------------------------------------------------------
-// user and home routines
-//------------------------------------------------------------------------
+bool wxColourDisplay()
+{
+    return true;
+}

 
 

-const char* wxGetHomeDir( wxString *home  )
+int wxDisplayDepth()

 {
 {

-    *home = wxGetUserHome( wxString() );
-    if (home->IsNull()) *home = "/";
-    return *home;
+    return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth;

 }
 
 }
 

-char *wxGetUserHome( const wxString &user )
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)

 {
 {

-    struct passwd *who = (struct passwd *) NULL;
+    return wxGenericFindWindowAtPoint(pt);
+}
+
+#if !wxUSE_UNICODE

 
 

-    if (user.IsNull() || (user== ""))
+WXDLLIMPEXP_CORE wxCharBuffer
+wxConvertToGTK(const wxString& s, wxFontEncoding enc)
+{
+    wxWCharBuffer wbuf;
+    if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )

     {
     {

-        register char *ptr;
-
-        if ((ptr = getenv("HOME")) != NULL)
-       {
-            return ptr;
-       }
-        if ((ptr = getenv("USER")) != NULL || (ptr = getenv("LOGNAME")) != NULL) 
-       {
-            who = getpwnam(ptr);
-        }
-        // We now make sure the the user exists!
-        if (who == NULL)
-       {
-            who = getpwuid(getuid());
-       }
+        wbuf = wxConvUI->cMB2WC(s.c_str());

     }
     }

-    else
+    else // another encoding, use generic conversion class
+    {
+        wbuf = wxCSConv(enc).cMB2WC(s.c_str());
+    }
+
+    if ( !wbuf && !s.empty() )

     {
     {

-      who = getpwnam (user);
+        // conversion failed, but we still want to show something to the user
+        // even if it's going to be wrong it is better than nothing
+        //
+        // we choose ISO8859-1 here arbitrarily, it's just the most common
+        // encoding probably and, also importantly here, conversion from it
+        // never fails as it's done internally by wxCSConv
+        wbuf = wxCSConv(wxFONTENCODING_ISO8859_1).cMB2WC(s.c_str());

     }
 
     }
 

-    return who ? who->pw_dir : (char*)NULL;
+    return wxConvUTF8.cWC2MB(wbuf);
+}
+
+WXDLLIMPEXP_CORE wxCharBuffer
+wxConvertFromGTK(const wxString& s, wxFontEncoding enc)
+{
+    // this conversion should never fail as GTK+ always uses UTF-8 internally
+    // so there are no complications here
+    const wxWCharBuffer wbuf(wxConvUTF8.cMB2WC(s.c_str()));
+    if ( enc == wxFONTENCODING_SYSTEM )
+        return wxConvUI->cWC2MB(wbuf);
+
+    return wxCSConv(enc).cWC2MB(wbuf);

 }
 
 }
 

-//------------------------------------------------------------------------
-// id routines
-//------------------------------------------------------------------------
+#endif // !wxUSE_UNICODE

 
 

-bool wxGetHostName(char *buf, int sz)
+// Returns false if version is certainly greater or equal than major.minor.micro
+// Returns true if version is lower than major.minor.micro OR it cannot be
+// determined and one should not rely on the availability of pango version
+// major.minor.micro, nor the non-availability
+const gchar *wx_pango_version_check (int major, int minor, int micro)

 {
 {

-    *buf = '\0';
-#if defined(__SVR4__) && !defined(__sgi)
-    //KB: does this return the fully qualified host.domain name?
-    return (sysinfo(SI_HOSTNAME, buf, sz) != -1);
-#else /* BSD Sockets */
-    char name[255], domain[255];
-    //struct hostent *h;
-    // Get hostname
-    if (gethostname(name, sizeof(name)/sizeof(char)-1) == -1)
-        return FALSE;
-    if (getdomainname(domain, sizeof(domain)/sizeof(char)-1) == -1)
-        return FALSE;
-    // Get official full name of host
-    // doesn't return the full qualified name, replaced by following
-    // code (KB)
-    // strncpy(buf, (h=gethostbyname(name))!=NULL ? h->h_name : name, sz-1);
-    if((unsigned)sz > strlen(name)+strlen(domain)+1)
+#ifdef PANGO_VERSION_MAJOR
+    if (!gtk_check_version (2,11,0))

     {
     {

-        strcpy(buf, name);
-        if(strcmp(domain,"(none)") == 0) // standalone machine
-        {
-            strcat(buf,".");
-            strcat(buf,domain);
-        }
+        // GTK+ 2.11 requires Pango >= 1.15.3 and pango_version_check
+        // was added in Pango 1.15.2 thus we know for sure the pango lib we're
+        // using has the pango_version_check function:
+        return pango_version_check (major, minor, micro);

     }
     }

-    else
-        return FALSE;
-    return TRUE;
+
+    return "can't check";
+#else // !PANGO_VERSION_MAJOR
+    return "too old headers";

 #endif
 }
 
 #endif
 }
 

-bool wxGetUserId(char *buf, int sz)
+
+// ----------------------------------------------------------------------------
+// subprocess routines
+// ----------------------------------------------------------------------------
+
+extern "C" {
+static
+void GTK_EndProcessDetector(gpointer data, gint source,
+                            GdkInputCondition WXUNUSED(condition) )

 {
 {

-    struct passwd *who;
+   wxEndProcessData *proc_data = (wxEndProcessData *)data;

 
 

-    *buf = '\0';
-    if ((who = getpwuid(getuid ())) != NULL) {
-        strncpy (buf, who->pw_name, sz-1);
-        return TRUE;
-    }
-    return FALSE;
+   // 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);
+
+   if ( rc == 0 )
+   {
+       // no, it didn't exit yet, continue waiting
+       return;
+   }
+
+   // set exit code to -1 if something bad happened
+   proc_data->exitcode = rc != -1 && WIFEXITED(status) ? WEXITSTATUS(status)
+                                                      : -1;
+
+   // child exited, end waiting
+   close(source);
+
+   // don't call us again!
+   gdk_input_remove(proc_data->tag);
+
+   wxHandleProcessTermination(proc_data);
+}

 }
 
 }
 

-bool wxGetUserName(char *buf, int sz)
+int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)

 {
 {

-    struct passwd *who;
-    char *comma;
-
-    *buf = '\0';
-    if ((who = getpwuid (getuid ())) != NULL) {
-       comma = strchr(who->pw_gecos,'c');
-       if(comma) *comma = '\0'; // cut off non-name comment fields
-       strncpy (buf, who->pw_gecos, sz - 1);
-        return TRUE;
-    }
-    return FALSE;
+    int tag = gdk_input_add(fd,
+                            GDK_INPUT_READ,
+                            GTK_EndProcessDetector,
+                            (gpointer)proc_data);
+
+    return tag;

 }
 
 }
 

-//------------------------------------------------------------------------
-// error and debug output routines
-//------------------------------------------------------------------------

 
 

-void wxDebugMsg( const char *format, ... )
-{
-  va_list ap;
-  va_start( ap, format );
-  vfprintf( stderr, format, ap );
-  fflush( stderr );
-  va_end(ap);
-};

 
 

-void wxError( const wxString &msg, const wxString &title )
-{
-  fprintf( stderr, "Error " );
-  if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
-  if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
-  fprintf( stderr, ".\n" );
-};
+// ----------------------------------------------------------------------------
+// wxPlatformInfo-related
+// ----------------------------------------------------------------------------

 
 

-void wxFatalError( const wxString &msg, const wxString &title )
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const

 {
 {

-  fprintf( stderr, "Error " );
-  if (!title.IsNull()) fprintf( stderr, "%s ", WXSTRINGCAST(title) );
-  if (!msg.IsNull()) fprintf( stderr, ": %s", WXSTRINGCAST(msg) );
-  fprintf( stderr, ".\n" );
-  exit(3); // the same exit code as for abort()
-};
+    if ( verMaj )
+        *verMaj = gtk_major_version;
+    if ( verMin )
+        *verMin = gtk_minor_version;
+
+    return wxPORT_GTK;
+}

 
 

-//------------------------------------------------------------------------
-// directory routines
-//------------------------------------------------------------------------
+#if wxUSE_TIMER

 
 

-bool wxDirExists( const wxString& dir )
+wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)

 {
 {

-    char buf[500];
-    strcpy( buf, WXSTRINGCAST(dir) );
-    struct stat sbuf;
-    return ((stat(buf, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE);
-};
+    return new wxGTKTimerImpl(timer);
+}

 
 

-//------------------------------------------------------------------------
-// subprocess routines
-//------------------------------------------------------------------------
+#endif // wxUSE_TIMER

 
 

-struct wxEndProcessData
+#if wxUSE_DETECT_SM
+static wxString GetSM()

 {
 {

-  gint pid, tag;
-  wxProcess *process;
-};
+    class Dpy
+    {
+    public:
+        Dpy() { m_dpy = XOpenDisplay(NULL); }
+        ~Dpy() { if ( m_dpy ) XCloseDisplay(m_dpy); }
+
+        operator Display *() const { return m_dpy; }
+    private:
+        Display *m_dpy;
+    } dpy;
+
+    if ( !dpy )
+        return wxEmptyString;
+
+    char smerr[256];
+    char *client_id;
+    SmcConn smc_conn = SmcOpenConnection(NULL, NULL,
+                                         999, 999,
+                                         0 /* mask */, NULL /* callbacks */,
+                                         NULL, &client_id,
+                                         WXSIZEOF(smerr), smerr);
+
+    if ( !smc_conn )
+    {
+        wxLogWarning(_("Failed to connect to session manager: %s"), smerr);
+        return wxEmptyString;
+    }
+
+    char *vendor = SmcVendor(smc_conn);
+    wxString ret = wxString::FromAscii( vendor );
+    free(vendor);
+
+    SmcCloseConnection(smc_conn, 0, NULL);
+    free(client_id);
+
+    return ret;
+}
+#endif // wxUSE_DETECT_SM
+

 
 

-static void GTK_EndProcessDetector(gpointer data, gint source,
-                                   GdkInputCondition WXUNUSED(condition) )
+//-----------------------------------------------------------------------------
+// wxGUIAppTraits
+//-----------------------------------------------------------------------------
+
+wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()

 {
 {

-  wxEndProcessData *proc_data = (wxEndProcessData *)data;
-  int pid;
+    return new wxEventLoop();
+}

 
 

-  pid = (proc_data->pid > 0) ? proc_data->pid : -(proc_data->pid);

 
 

-  /* wait4 is not part of any standard, use at own risk
-   * not sure what wait4 does, but wait3 seems to be closest, whats a digit ;-)
-   * --- offer@sgi.com */
-#if !defined(__sgi)
-  wait4(proc_data->pid, NULL, 0, NULL);
-#else
-  wait3((int *) NULL, 0, (rusage *) NULL);
+#if wxUSE_INTL
+void wxGUIAppTraits::SetLocale()
+{
+    gtk_set_locale();
+    wxUpdateLocaleIsUtf8();
+}

 #endif
 
 #endif
 

-  close(source);
-  gdk_input_remove(proc_data->tag);
-
-  if (proc_data->process)
-    proc_data->process->OnTerminate(proc_data->pid);
+#ifdef __WXDEBUG__

 
 

-  if (proc_data->pid > 0)
-    delete proc_data;
-  else
-    proc_data->pid = 0;
-};
+#if wxUSE_STACKWALKER

 
 

-long wxExecute( char **argv, bool sync, wxProcess *process )
+// private helper class
+class StackDump : public wxStackWalker

 {
 {

-    wxEndProcessData *data = new wxEndProcessData;
-    int end_proc_detect[2];
+public:
+    StackDump(GtkAssertDialog *dlg) { m_dlg=dlg; }
+
+protected:
+    virtual void OnStackFrame(const wxStackFrame& frame)
+    {
+        wxString fncname = frame.GetName();
+        wxString fncargs = fncname;

 
 

-    wxCHECK_MSG( *argv, 0, "can't exec empty command" );
+        size_t n = fncname.find(wxT('('));
+        if (n != wxString::npos)
+        {
+            // remove arguments from function name
+            fncname.erase(n);

 
 

-    /* Create pipes */
-    if (pipe(end_proc_detect) == -1) {
-      wxLogSysError(_("Pipe creation failed"));
-      return 0;
+            // remove function name and brackets from arguments
+            fncargs = fncargs.substr(n+1, fncargs.length()-n-2);
+        }
+        else
+            fncargs = wxEmptyString;
+
+        // append this stack frame's info in the dialog
+        if (!frame.GetFileName().empty() || !fncname.empty())
+            gtk_assert_dialog_append_stack_frame(m_dlg,
+                                                fncname.mb_str(),
+                                                fncargs.mb_str(),
+                                                frame.GetFileName().mb_str(),
+                                                frame.GetLine());

     }
 
     }
 

-    /* fork the process */
-#if defined(sun) || defined(__ultrix) || defined(__bsdi__)
-    pid_t pid = vfork();
-#else
-    pid_t pid = fork();
-#endif
-    if (pid == -1) {
-        // error
-        wxLogSysError(_("Fork failed"));
-        return 0;
+private:
+    GtkAssertDialog *m_dlg;
+};
+
+// the callback functions must be extern "C" to comply with GTK+ declarations
+extern "C"
+{
+    void get_stackframe_callback(StackDump *dump)
+    {
+        // skip over frames up to including wxOnAssert()
+        dump->ProcessFrames(3);

     }
     }

-    else if (pid == 0) {
-        // we're in child
-        close(end_proc_detect[0]); // close reading side
-       // These three lines close the open file descriptors to
-       // to avoid any input/output which might block the process
-       // or irritate the user. If one wants proper IO for the sub-
-       // process, the "right thing to do" is to start an xterm executing
-       // it.
-       close(STDIN_FILENO);
-       close(STDOUT_FILENO);
-       close(STDERR_FILENO);
-
-#ifdef _AIX
-        execvp ((const char *)*argv, (const char **)argv);
-#else
-        execvp (*argv, argv);
-#endif
-        // there is no return after successful exec()
-        wxLogSysError(_("Can't execute '%s'"), *argv);
+}

 
 

-        _exit(-1);
+#endif      // wxUSE_STACKWALKER
+
+bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
+{
+    // under GTK2 we prefer to use a dialog widget written using directly GTK+;
+    // in fact we cannot use a dialog written using wxWidgets: it would need
+    // the wxWidgets idle processing to work correctly!
+    GtkWidget *dialog = gtk_assert_dialog_new();
+    gtk_assert_dialog_set_message(GTK_ASSERT_DIALOG(dialog), msg.mb_str());
+
+#if wxUSE_STACKWALKER
+    // don't show more than maxLines or we could get a dialog too tall to be
+    // shown on screen: 20 should be ok everywhere as even with 15 pixel high
+    // characters it is still only 300 pixels...
+    static const int maxLines = 20;
+
+    // save current stack frame...
+    StackDump dump(GTK_ASSERT_DIALOG(dialog));
+    dump.SaveStack(maxLines);
+
+    // ...but process it only if the user needs it
+    gtk_assert_dialog_set_backtrace_callback(GTK_ASSERT_DIALOG(dialog),
+                                             (GtkAssertDialogStackFrameCallback)get_stackframe_callback,
+                                             &dump);
+#endif      // wxUSE_STACKWALKER
+
+    gint result = gtk_dialog_run(GTK_DIALOG (dialog));
+    bool returnCode = false;
+    switch (result)
+    {
+    case GTK_ASSERT_DIALOG_STOP:
+        wxTrap();
+        break;
+    case GTK_ASSERT_DIALOG_CONTINUE:
+        // nothing to do
+        break;
+    case GTK_ASSERT_DIALOG_CONTINUE_SUPPRESSING:
+        // no more asserts
+        returnCode = true;
+        break;
+
+    default:
+        wxFAIL_MSG( _T("unexpected return code from GtkAssertDialog") );

     }
     }

-    else {
-      // we're in parent
-      close(end_proc_detect[1]); // close writing side
-      data->tag = gdk_input_add(end_proc_detect[0], GDK_INPUT_READ,
-                                GTK_EndProcessDetector, (gpointer)data);
-      data->pid = pid;
-      if (!sync) {
-        data->process = process;
-      }
-      else {
-        data->process = (wxProcess *) NULL;
-        data->pid = -(data->pid);
-
-        while (data->pid != 0)
-          wxYield();
-
-        delete data;
-      }
-
-      // @@@ our return value indicates success even if execvp() in the child
-      //     failed!
-      return pid;
+
+    gtk_widget_destroy(dialog);
+    return returnCode;
+}
+
+#endif  // __WXDEBUG__
+
+wxString wxGUIAppTraits::GetDesktopEnvironment() const
+{
+    wxString de = wxSystemOptions::GetOption(_T("gtk.desktop"));
+#if wxUSE_DETECT_SM
+    if ( de.empty() )
+    {
+        static const wxString s_SM = GetSM();
+
+        if (s_SM == wxT("GnomeSM"))
+            de = wxT("GNOME");
+        else if (s_SM == wxT("KDE"))
+            de = wxT("KDE");

     }
     }

+#endif // wxUSE_DETECT_SM
+
+    return de;
+}
+
+#ifdef __WXGTK26__
+
+// 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
+struct _GOptionGroup
+{
+  gchar           *name;
+  gchar           *description;
+  gchar           *help_description;
+
+  GDestroyNotify   destroy_notify;
+  gpointer         user_data;
+
+  GTranslateFunc   translate_func;
+  GDestroyNotify   translate_notify;
+  gpointer     translate_data;
+
+  GOptionEntry    *entries;
+  gint             n_entries;
+
+  GOptionParseFunc pre_parse_func;
+  GOptionParseFunc post_parse_func;
+  GOptionErrorFunc error_func;

 };
 
 };
 

-long wxExecute( const wxString& command, bool sync, wxProcess *process )
+wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
+{
+    wxString ret;
+
+    if (opt->short_name)
+        ret << _T("-") << opt->short_name;
+    if (opt->long_name)
+    {
+        if (!ret.empty())
+            ret << _T(", ");
+        ret << _T("--") << opt->long_name;
+
+        if (opt->arg_description)
+            ret << _T("=") << opt->arg_description;
+    }
+
+    return _T("  ") + ret;
+}
+
+#endif // __WXGTK26__
+
+wxString
+wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
+                                          wxArrayString& desc) const

 {
 {

-    static const char *IFS = " \t\n";
+    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))
+    {
+        usage << _("The following standard GTK+ options are also supported:\n");

 
 

-    wxCHECK_MSG( !command.IsEmpty(), 0, "can't exec empty command" );
+        // 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);

 
 

-    int argc = 0;
-    char *argv[127];
-    char *tmp = new char[command.Len() + 1];
-    strcpy(tmp, command);
+        // WARNING: here we access the internals of GOptionGroup:
+        GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
+        unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
+        wxArrayString namesOptions, descOptions;

 
 

-    argv[argc++] = strtok(tmp, IFS);
-    while ((argv[argc++] = strtok((char *) NULL, IFS)) != NULL)
-        /* loop */ ;
+        for ( size_t n = 0; n < n_entries; n++ )
+        {
+            if ( entries[n].flags & G_OPTION_FLAG_HIDDEN )
+                continue;       // skip

 
 

-    long lRc = wxExecute(argv, sync, process);
-    
-    delete [] tmp;
+            names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));
+
+            const gchar * const entryDesc = entries[n].description;
+            desc.push_back(entryDesc ? wxString(entryDesc) : _T(""));
+        }
+
+        g_option_group_free (gtkOpts);
+    }
+#else
+    wxUnusedVar(names);
+    wxUnusedVar(desc);
+#endif // __WXGTK26__
+
+    return usage;
+}

 
 

-    return lRc;
-};