X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/baa4a9670541f4ecd33a3979cab46c63680db079..7f19ef40eb05ef30e63ce12d40071d35b1d5aaaf:/src/gtk/utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 19f3ffbe09..e337be9792 100644
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -26,12 +26,12 @@
 #include "wx/gtk/private/timer.h"
 #include "wx/evtloop.h"
 
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
     #include "wx/gtk/assertdlg_gtk.h"
     #if wxUSE_STACKWALKER
         #include "wx/stackwalk.h"
     #endif // wxUSE_STACKWALKER
-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL
 
 #include <stdarg.h>
 #include <string.h>
@@ -45,18 +45,6 @@
 #include "gtk/gtk.h"
 #include "gdk/gdkx.h"
 
-#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
-
-    #include "X11/XKBlib.h"
-
-    #undef explicit
-#endif // HAVE_X11_XKBLIB_H
-
-
 #if wxUSE_DETECT_SM
     #include "X11/Xlib.h"
     #include "X11/SM/SMlib.h"
@@ -80,22 +68,6 @@ void wxBell()
 }
 #endif
 
-/* Don't synthesize KeyUp events holding down a key and producing
-   KeyDown events with autorepeat. */
-#ifdef HAVE_X11_XKBLIB_H
-bool wxSetDetectableAutoRepeat( bool flag )
-{
-    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
-
 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------
@@ -119,7 +91,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()
@@ -186,6 +158,10 @@ wxConvertFromGTK(const wxString& s, wxFontEncoding enc)
 // availability of pango version major.minor.micro, nor the non-availability
 const gchar *wx_pango_version_check (int major, int minor, int micro)
 {
+    // NOTE: you don't need to use this macro to check for Pango features
+    //       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
     if (!gtk_check_version (2,11,0))
     {
@@ -324,9 +300,7 @@ void wxGUIAppTraits::SetLocale()
 }
 #endif
 
-#ifdef __WXDEBUG__
-
-#if wxUSE_STACKWALKER
+#if wxDEBUG_LEVEL && wxUSE_STACKWALKER
 
 // private helper class
 class StackDump : public wxStackWalker
@@ -375,60 +349,65 @@ extern "C"
     }
 }
 
-#endif      // wxUSE_STACKWALKER
+#endif // wxDEBUG_LEVEL && 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 wxDEBUG_LEVEL
+    // we can't show the dialog from another thread
+    if ( wxIsMainThread() )
+    {
+        // under GTK2 we prefer to use a dialog widget written using directly
+        // in GTK+ as use a dialog written using wxWidgets would need the
+        // wxWidgets idle processing to work correctly which might not be the
+        // case when assert happens
+        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") );
+        // save the current stack ow...
+        StackDump dump(GTK_ASSERT_DIALOG(dialog));
+        dump.SaveStack(100); // showing more than 100 frames is not very useful
+
+        // ...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( wxT("unexpected return code from GtkAssertDialog") );
+        }
+
+        gtk_widget_destroy(dialog);
+        return returnCode;
     }
+#endif // wxDEBUG_LEVEL
 
-    gtk_widget_destroy(dialog);
-    return returnCode;
+    return wxAppTraitsBase::ShowAssertDialog(msg);
 }
 
-#endif  // __WXDEBUG__
-
 wxString wxGUIAppTraits::GetDesktopEnvironment() const
 {
-    wxString de = wxSystemOptions::GetOption(_T("gtk.desktop"));
+    wxString de = wxSystemOptions::GetOption(wxT("gtk.desktop"));
 #if wxUSE_DETECT_SM
     if ( de.empty() )
     {
@@ -477,18 +456,18 @@ wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
     wxString ret;
 
     if (opt->short_name)
-        ret << _T("-") << opt->short_name;
+        ret << wxT("-") << opt->short_name;
     if (opt->long_name)
     {
         if (!ret.empty())
-            ret << _T(", ");
-        ret << _T("--") << opt->long_name;
+            ret << wxT(", ");
+        ret << wxT("--") << opt->long_name;
 
         if (opt->arg_description)
-            ret << _T("=") << opt->arg_description;
+            ret << wxT("=") << opt->arg_description;
     }
 
-    return _T("  ") + ret;
+    return wxT("  ") + ret;
 }
 
 #endif // __WXGTK26__
@@ -508,7 +487,7 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
         // 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))
+        if (!glib_check_version(2,6,0) && glib_check_version(2,20,0))
         {
             usage << _("The following standard GTK+ options are also supported:\n");