X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..a188ac2988b6fedeead7a809124b8eaa2290c020:/src/gtk/utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 76a2c7fa8c..73d152d248 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>
@@ -186,6 +186,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 +328,7 @@ void wxGUIAppTraits::SetLocale()
 }
 #endif
 
-#ifdef __WXDEBUG__
-
-#if wxUSE_STACKWALKER
+#if wxDEBUG_LEVEL && wxUSE_STACKWALKER
 
 // private helper class
 class StackDump : public wxStackWalker
@@ -375,13 +377,15 @@ 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!
+#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());
 
@@ -422,10 +426,13 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
 
     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 de = wxSystemOptions::GetOption(_T("gtk.desktop"));
@@ -508,7 +515,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");