Don't pop explicitly changed status messages.

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 036cb582115fe1b88fd5b85bc6879bcfcb135774..a2abf1d037226d3b729bcae469e46c8da9334fbe 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"
 
-#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>
@@ -328,9 +328,7 @@ void wxGUIAppTraits::SetLocale()
 }
 #endif
 
-#ifdef __WXDEBUG__
-
-#if wxUSE_STACKWALKER
+#if wxDEBUG_LEVEL && wxUSE_STACKWALKER
 
 // private helper class
 class StackDump : public wxStackWalker
@@ -379,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());
 
@@ -421,18 +421,21 @@ 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);
     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"));
+    wxString de = wxSystemOptions::GetOption(wxT("gtk.desktop"));
 #if wxUSE_DETECT_SM
     if ( de.empty() )
     {
@@ -481,18 +484,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__
@@ -512,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");