Removed wxFont::Set/GetNoAntiAliasing() implementations.

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 76a2c7fa8c62f7a97eaf76fabd128c7a7ce387e3..bfcbbc8ab20497ec8a771cf321381e7600418f1f 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -26,12 +26,12 @@
 #include "wx/gtk/private/timer.h"
 #include "wx/evtloop.h"
 
 #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
     #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>
 
 #include <stdarg.h>
 #include <string.h>


@@ -45,18 +45,6 @@
 #include "gtk/gtk.h"
 #include "gdk/gdkx.h"
 
 #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"
 #if wxUSE_DETECT_SM
     #include "X11/Xlib.h"
     #include "X11/SM/SMlib.h"


@@ -80,22 +68,6 @@ void wxBell()
 }
 #endif
 
 }
 #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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // display characterstics
 // ----------------------------------------------------------------------------


@@ -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)
 {
 // 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))
     {
 #ifdef PANGO_VERSION_MAJOR
     if (!gtk_check_version (2,11,0))
     {


@@ -324,9 +300,7 @@ void wxGUIAppTraits::SetLocale()
 }
 #endif
 
 }
 #endif
 

-#ifdef __WXDEBUG__
-
-#if wxUSE_STACKWALKER
+#if wxDEBUG_LEVEL && wxUSE_STACKWALKER

 
 // private helper class
 class StackDump : public wxStackWalker
 
 // private helper class
 class StackDump : public wxStackWalker


@@ -375,13 +349,15 @@ extern "C"
     }
 }
 
     }
 }
 

-#endif      // wxUSE_STACKWALKER
+#endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER

 
 bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
 {
 
 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!
+#if wxDEBUG_LEVEL
+    // 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());
 
     GtkWidget *dialog = gtk_assert_dialog_new();
     gtk_assert_dialog_set_message(GTK_ASSERT_DIALOG(dialog), msg.mb_str());
 


@@ -417,18 +393,21 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
         break;
 
     default:
         break;
 
     default:

-        wxFAIL_MSG( _T("unexpected return code from GtkAssertDialog") );
+        wxFAIL_MSG( wxT("unexpected return code from GtkAssertDialog") );

     }
 
     gtk_widget_destroy(dialog);
     return returnCode;
     }
 
     gtk_widget_destroy(dialog);
     return returnCode;

+#else // !wxDEBUG_LEVEL
+    // this function is never called in this case
+    wxUnusedVar(msg);
+    return false;
+#endif // wxDEBUG_LEVEL/!wxDEBUG_LEVEL

 }
 
 }
 

-#endif  // __WXDEBUG__
-

 wxString wxGUIAppTraits::GetDesktopEnvironment() const
 {
 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() )
     {
 #if wxUSE_DETECT_SM
     if ( de.empty() )
     {


@@ -477,18 +456,18 @@ wxString wxGetNameFromGtkOptionEntry(const GOptionEntry *opt)
     wxString ret;
 
     if (opt->short_name)
     wxString ret;
 
     if (opt->short_name)

-        ret << _T("-") << opt->short_name;
+        ret << wxT("-") << opt->short_name;

     if (opt->long_name)
     {
         if (!ret.empty())
     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)
 
         if (opt->arg_description)

-            ret << _T("=") << opt->arg_description;
+            ret << wxT("=") << opt->arg_description;

     }
 
     }
 

-    return _T("  ") + ret;
+    return wxT("  ") + ret;

 }
 
 #endif // __WXGTK26__
 }
 
 #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)
         // 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");
 
         {
             usage << _("The following standard GTK+ options are also supported:\n");