]> git.saurik.com Git - wxWidgets.git/commitdiff
gtk_assert_dialog_set_message() was unintentionally excluded in r73163
authorPaul Cornett <paulcor@bullseye.com>
Thu, 3 Jan 2013 16:43:40 +0000 (16:43 +0000)
committerPaul Cornett <paulcor@bullseye.com>
Thu, 3 Jan 2013 16:43:40 +0000 (16:43 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk/assertdlg_gtk.cpp
src/gtk/utilsgtk.cpp

index 3eb254b946ba0c6d82b04b5c4708d5ec22085777..6f1ef8eb1d3f75c198efa3056f654d7257035a45 100644 (file)
@@ -433,6 +433,8 @@ gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg)
     return g_string_free (string, FALSE);
 }
 
+#endif // wxUSE_STACKWALKER
+
 void gtk_assert_dialog_set_message(GtkAssertDialog *dlg, const gchar *msg)
 {
     /* prepend and append the <b> tag
@@ -448,6 +450,8 @@ void gtk_assert_dialog_set_message(GtkAssertDialog *dlg, const gchar *msg)
     g_free (escaped_msg);
 }
 
+#if wxUSE_STACKWALKER
+
 void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg,
                                               GtkAssertDialogStackFrameCallback callback,
                                               void *userdata)
index a542d3066d124417577d60fadc43e0f7e3128bf2..c25b9faa0596110dd1f3bd66c99dbf3db7b358d5 100644 (file)
@@ -334,9 +334,9 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
         // wxWidgets idle processing to work correctly which might not be the
         // case when assert happens
         GtkWidget *dialog = gtk_assert_dialog_new();
-#if wxUSE_STACKWALKER
         gtk_assert_dialog_set_message(GTK_ASSERT_DIALOG(dialog), msg.mb_str());
 
+#if wxUSE_STACKWALKER
         // save the current stack ow...
         StackDump dump(GTK_ASSERT_DIALOG(dialog));
         dump.SaveStack(100); // showing more than 100 frames is not very useful