Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk_assert_dialog_set_message() was unintentionally excluded in r73163

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-01-03 16:43:40 +00:00
parent 3a0c6eff1b
commit 2a9332ae2c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/assertdlg_gtk.cpp
View File

@@ -433,6 +433,8 @@ gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg)
return g_string_free (string, FALSE); return g_string_free (string, FALSE);
} }
#endif // wxUSE_STACKWALKER
void gtk_assert_dialog_set_message(GtkAssertDialog *dlg, const gchar *msg) void gtk_assert_dialog_set_message(GtkAssertDialog *dlg, const gchar *msg)
{ {
/* prepend and append the <b> tag /* 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); g_free (escaped_msg);
} }
#if wxUSE_STACKWALKER
void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg, void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg,
GtkAssertDialogStackFrameCallback callback, GtkAssertDialogStackFrameCallback callback,
void *userdata) void *userdata)

2
src/gtk/utilsgtk.cpp
View File

@@ -334,9 +334,9 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg)
// wxWidgets idle processing to work correctly which might not be the // wxWidgets idle processing to work correctly which might not be the
// case when assert happens // case when assert happens
GtkWidget *dialog = gtk_assert_dialog_new(); GtkWidget *dialog = gtk_assert_dialog_new();
#if wxUSE_STACKWALKER
gtk_assert_dialog_set_message(GTK_ASSERT_DIALOG(dialog), msg.mb_str()); gtk_assert_dialog_set_message(GTK_ASSERT_DIALOG(dialog), msg.mb_str());
#if wxUSE_STACKWALKER
// save the current stack ow... // save the current stack ow...
StackDump dump(GTK_ASSERT_DIALOG(dialog)); StackDump dump(GTK_ASSERT_DIALOG(dialog));
dump.SaveStack(100); // showing more than 100 frames is not very useful dump.SaveStack(100); // showing more than 100 frames is not very useful