From 2a9332ae2c468073279e9746cdb95fc759f5b640 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 3 Jan 2013 16:43:40 +0000 Subject: [PATCH] gtk_assert_dialog_set_message() was unintentionally excluded in r73163 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/assertdlg_gtk.cpp | 4 ++++ src/gtk/utilsgtk.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp index 3eb254b946..6f1ef8eb1d 100644 --- a/src/gtk/assertdlg_gtk.cpp +++ b/src/gtk/assertdlg_gtk.cpp @@ -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 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) diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index a542d3066d..c25b9faa05 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -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 -- 2.45.2