using on all OSX variants

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 73d152d248200b9f042eec89a169c0d2de62aa23..bfcbbc8ab20497ec8a771cf321381e7600418f1f 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -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
 // ----------------------------------------------------------------------------
@@ -189,7 +161,7 @@ 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))
     {
@@ -421,7 +393,7 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
         break;
 
     default:
-        wxFAIL_MSG( _T("unexpected return code from GtkAssertDialog") );
+        wxFAIL_MSG( wxT("unexpected return code from GtkAssertDialog") );
     }
 
     gtk_widget_destroy(dialog);
@@ -435,7 +407,7 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
 
 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() )
     {
@@ -484,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__