Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 774358195e7dc3d7da9d46709aadbfaaabeb524c..ff35fcf9ae417f822cc21609efd4439fe9fe441f 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -2,7 +2,6 @@
 // Name:        src/gtk/utilsgtk.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        src/gtk/utilsgtk.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -21,11 +20,18 @@
 #include "wx/apptrait.h"
 #include "wx/process.h"
 #include "wx/sysopt.h"
 #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"
 
 
 #include "wx/gtk/private/timer.h"
 #include "wx/evtloop.h"
 

+#include <gtk/gtk.h>
+#ifdef GDK_WINDOWING_WIN32
+#include <gdk/gdkwin32.h>
+#endif
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+

 #if wxDEBUG_LEVEL
     #include "wx/gtk/assertdlg_gtk.h"
     #if wxUSE_STACKWALKER
 #if wxDEBUG_LEVEL
     #include "wx/gtk/assertdlg_gtk.h"
     #if wxUSE_STACKWALKER


@@ -37,11 +43,9 @@
 #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
+#ifdef __UNIX__

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

-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
+#endif

 
 #if wxUSE_DETECT_SM
     #include <X11/SM/SMlib.h>
 
 #if wxUSE_DETECT_SM
     #include <X11/SM/SMlib.h>


@@ -49,6 +53,8 @@
     #include "wx/unix/utilsx11.h"
 #endif
 
     #include "wx/unix/utilsx11.h"
 #endif
 

+#include "wx/gtk/private/gtk2-compat.h"
+

 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -58,23 +64,22 @@ extern GtkWidget *wxGetRootWindow();
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------

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

 
 void wxBell()
 {
     gdk_beep();
 }
 
 void wxBell()
 {
     gdk_beep();
 }

-#endif

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// display characterstics
+// display characteristics

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

+#ifdef GDK_WINDOWING_X11

 void *wxGetDisplay()
 {
 void *wxGetDisplay()
 {

-    return GDK_DISPLAY();
+    return GDK_DISPLAY_XDISPLAY(gtk_widget_get_display(wxGetRootWindow()));

 }
 }

+#endif

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


@@ -88,11 +93,6 @@ void wxDisplaySizeMM( int *width, int *height )
     if (height) *height = gdk_screen_height_mm();
 }
 
     if (height) *height = gdk_screen_height_mm();
 }
 

-void wxGetMousePosition( int* x, int* y )
-{
-    gdk_window_get_pointer( NULL, x, y, NULL );
-}
-

 bool wxColourDisplay()
 {
     return true;
 bool wxColourDisplay()
 {
     return true;


@@ -100,7 +100,7 @@ bool wxColourDisplay()
 
 int wxDisplayDepth()
 {
 
 int wxDisplayDepth()
 {

-    return gtk_widget_get_visual(wxGetRootWindow())->depth;
+    return gdk_visual_get_depth(gtk_widget_get_visual(wxGetRootWindow()));

 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 }
 
 wxWindow* wxFindWindowAtPoint(const wxPoint& pt)


@@ -116,7 +116,7 @@ wxConvertToGTK(const wxString& s, wxFontEncoding enc)
     wxWCharBuffer wbuf;
     if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
     {
     wxWCharBuffer wbuf;
     if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
     {

-        wbuf = wxConvUI->cMB2WC(s.c_str());
+        wbuf = wxConvUI->cMB2WC(s);

     }
     else // another encoding, use generic conversion class
     {
     }
     else // another encoding, use generic conversion class
     {


@@ -161,7 +161,9 @@ const gchar *wx_pango_version_check (int major, int minor, int micro)
     //       added in pango-1.4 or earlier since GTK 2.4 (our minimum requirement
     //       for GTK lib) required pango 1.4...
 
     //       added in pango-1.4 or earlier since GTK 2.4 (our minimum requirement
     //       for GTK lib) required pango 1.4...
 

-#ifdef PANGO_VERSION_MAJOR
+#ifdef __WXGTK3__
+    return pango_version_check(major, minor, micro);
+#elif defined(PANGO_VERSION_MAJOR)

     if (!gtk_check_version (2,11,0))
     {
         // GTK+ 2.11 requires Pango >= 1.15.3 and pango_version_check
     if (!gtk_check_version (2,11,0))
     {
         // GTK+ 2.11 requires Pango >= 1.15.3 and pango_version_check


@@ -180,35 +182,6 @@ const gchar *wx_pango_version_check (int major, int minor, int micro)
 #endif
 }
 
 #endif
 }
 

-
-// ----------------------------------------------------------------------------
-// subprocess routines
-// ----------------------------------------------------------------------------
-
-extern "C" {
-static gboolean EndProcessDetector(GIOChannel* source, GIOCondition, void* data)
-{
-    wxEndProcessData * const
-        proc_data = static_cast<wxEndProcessData *>(data);
-
-    // child exited, end waiting
-    close(g_io_channel_unix_get_fd(source));
-
-    wxHandleProcessTermination(proc_data);
-
-    // don't call us again!
-    return false;
-}
-}
-
-int wxGUIAppTraits::AddProcessCallback(wxEndProcessData *proc_data, int fd)
-{
-    return g_io_add_watch(
-        g_io_channel_unix_new(fd), G_IO_IN, EndProcessDetector, proc_data);
-}
-
-
-

 // ----------------------------------------------------------------------------
 // wxPlatformInfo-related
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxPlatformInfo-related
 // ----------------------------------------------------------------------------


@@ -275,13 +248,7 @@ wxEventLoopBase *wxGUIAppTraits::CreateEventLoop()
 }
 
 
 }
 
 

-#if wxUSE_INTL
-void wxGUIAppTraits::SetLocale()
-{
-    gtk_set_locale();
-    wxUpdateLocaleIsUtf8();
-}
-#endif
+#ifdef __UNIX__

 
 #if wxDEBUG_LEVEL && wxUSE_STACKWALKER
 
 
 #if wxDEBUG_LEVEL && wxUSE_STACKWALKER
 


@@ -295,41 +262,26 @@ protected:
     virtual void OnStackFrame(const wxStackFrame& frame)
     {
         wxString fncname = frame.GetName();
     virtual void OnStackFrame(const wxStackFrame& frame)
     {
         wxString fncname = frame.GetName();

-        wxString fncargs = fncname;
-
-        size_t n = fncname.find(wxT('('));
-        if (n != wxString::npos)
-        {
-            // remove arguments from function name
-            fncname.erase(n);
-
-            // 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())
 
         // append this stack frame's info in the dialog
         if (!frame.GetFileName().empty() || !fncname.empty())

+        {

             gtk_assert_dialog_append_stack_frame(m_dlg,
             gtk_assert_dialog_append_stack_frame(m_dlg,

-                                                fncname.mb_str(),
-                                                fncargs.mb_str(),
-                                                frame.GetFileName().mb_str(),
+                                                fncname.utf8_str(),
+                                                frame.GetFileName().utf8_str(),

                                                 frame.GetLine());
                                                 frame.GetLine());

+        }

     }
 
 private:
     GtkAssertDialog *m_dlg;
 };
 
     }
 
 private:
     GtkAssertDialog *m_dlg;
 };
 

-// the callback functions must be extern "C" to comply with GTK+ declarations
-extern "C"
+static void get_stackframe_callback(void* p)

 {
 {

-    void get_stackframe_callback(StackDump *dump)
-    {
-        // skip over frames up to including wxOnAssert()
-        dump->ProcessFrames(3);
-    }
+    StackDump* dump = static_cast<StackDump*>(p);
+    // skip over frames up to including wxOnAssert()
+    dump->ProcessFrames(6);

 }
 
 #endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER
 }
 
 #endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER


@@ -356,7 +308,7 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
         gtk_assert_dialog_set_backtrace_callback
         (
             GTK_ASSERT_DIALOG(dialog),
         gtk_assert_dialog_set_backtrace_callback
         (
             GTK_ASSERT_DIALOG(dialog),

-            (GtkAssertDialogStackFrameCallback)get_stackframe_callback,
+            get_stackframe_callback,

             &dump
         );
 #endif // wxUSE_STACKWALKER
             &dump
         );
 #endif // wxUSE_STACKWALKER


@@ -388,6 +340,10 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
     return wxAppTraitsBase::ShowAssertDialog(msg);
 }
 
     return wxAppTraitsBase::ShowAssertDialog(msg);
 }
 

+#endif // __UNIX__
+
+#if defined(__UNIX__) || defined(__OS2__)
+

 wxString wxGUIAppTraits::GetDesktopEnvironment() const
 {
     wxString de = wxSystemOptions::GetOption(wxT("gtk.desktop"));
 wxString wxGUIAppTraits::GetDesktopEnvironment() const
 {
     wxString de = wxSystemOptions::GetOption(wxT("gtk.desktop"));


@@ -406,7 +362,9 @@ wxString wxGUIAppTraits::GetDesktopEnvironment() const
     return de;
 }
 
     return de;
 }
 

-#ifdef __WXGTK26__
+#endif // __UNIX__ || __OS2__
+
+#ifdef __UNIX__

 
 // see the hack below in wxCmdLineParser::GetUsageString().
 // TODO: replace this hack with a g_option_group_get_entries()
 
 // see the hack below in wxCmdLineParser::GetUsageString().
 // TODO: replace this hack with a g_option_group_get_entries()


@@ -434,6 +392,7 @@ struct _GOptionGroup
   GOptionErrorFunc error_func;
 };
 
   GOptionErrorFunc error_func;
 };
 

+static

 wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
 {
     wxString ret;
 wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
 {
     wxString ret;


@@ -453,55 +412,44 @@ wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
     return wxT("  ") + ret;
 }
 
     return wxT("  ") + ret;
 }
 

-#endif // __WXGTK26__
-

 wxString
 wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
                                           wxArrayString& desc) const
 {
     wxString usage;
 
 wxString
 wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
                                           wxArrayString& desc) const
 {
     wxString usage;
 

-#ifdef __WXGTK26__
-    if (!gtk_check_version(2,6,0))
+    // check whether GLib version is greater than 2.6 but also lower than 2.33
+    // because, as we use the undocumented _GOptionGroup struct, we don't want
+    // to run this code with future versions which might change it (2.32 is the
+    // latest one at the time of this writing)
+    if (glib_check_version(2,33,0))

     {
     {

-        // since GTK>=2.6, we can use the glib_check_version() symbol...
-
-        // 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,20,0))
-        {
-            usage << _("The following standard GTK+ options are also supported:\n");
+        usage << _("The following standard GTK+ options are also supported:\n");

 
 

-            // 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);
+        // 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);

 
 

-            // WARNING: here we access the internals of GOptionGroup:
-            GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
-            unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
-            wxArrayString namesOptions, descOptions;
+        // WARNING: here we access the internals of GOptionGroup:
+        GOptionEntry *entries = ((_GOptionGroup*)gtkOpts)->entries;
+        unsigned int n_entries = ((_GOptionGroup*)gtkOpts)->n_entries;
+        wxArrayString namesOptions, descOptions;

 
 

-            for ( size_t n = 0; n < n_entries; n++ )
-            {
-                if ( entries[n].flags & G_OPTION_FLAG_HIDDEN )
-                    continue;       // skip
-
-                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(wxString(entryDesc));
-            }
+            names.push_back(wxGetNameFromGtkOptionEntry(&entries[n]));

 
 

-            g_option_group_free (gtkOpts);
+            const gchar * const entryDesc = entries[n].description;
+            desc.push_back(wxString(entryDesc));

         }
         }

+
+        g_option_group_free (gtkOpts);

     }
     }

-#else
-    wxUnusedVar(names);
-    wxUnusedVar(desc);
-#endif // __WXGTK26__

 
     return usage;
 }
 
 
     return usage;
 }
 

+#endif // __UNIX__