From: Paul Cornett Date: Tue, 11 Dec 2012 06:31:23 +0000 (+0000) Subject: add wrappers to avoid compiling code which will never be used X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3eabbbcc5d6a3dc2395a48eeed3da4bc894f644b add wrappers to avoid compiling code which will never be used git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp index b45c7dd5f1..17d46608d5 100644 --- a/src/gtk/assertdlg_gtk.cpp +++ b/src/gtk/assertdlg_gtk.cpp @@ -9,7 +9,8 @@ #include "wx/wxprec.h" -#include "wx/platform.h" +#if wxDEBUG_LEVEL + #include #include "wx/gtk/assertdlg_gtk.h" #include "wx/gtk/private/gtk2-compat.h" @@ -63,6 +64,8 @@ GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *labe return button; } +#if wxUSE_STACKWALKER + void gtk_assert_dialog_append_text_column (GtkWidget *treeview, const gchar *name, int index) { GtkCellRenderer *renderer; @@ -204,7 +207,11 @@ static void gtk_assert_dialog_copy_callback(GtkWidget*, GtkAssertDialog* dlg) g_free (backtrace); g_string_free (str, TRUE); } +} // extern "C" +#endif // wxUSE_STACKWALKER + +extern "C" { static void gtk_assert_dialog_continue_callback(GtkWidget*, GtkAssertDialog* dlg) { gint response = @@ -293,13 +300,15 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg) gtk_box_pack_end (GTK_BOX(vbox2), GTK_WIDGET(dlg->message), TRUE, TRUE, 8); } +#if wxUSE_STACKWALKER /* add the expander */ dlg->expander = gtk_expander_new_with_mnemonic ("Back_trace:"); gtk_box_pack_start (GTK_BOX(vbox), dlg->expander, TRUE, TRUE, 0); g_signal_connect (dlg->expander, "activate", G_CALLBACK(gtk_assert_dialog_expander_callback), dlg); +#endif // wxUSE_STACKWALKER } - +#if wxUSE_STACKWALKER { GtkWidget *hbox, *vbox, *button, *sw; @@ -334,6 +343,7 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg) GTK_STOCK_COPY); g_signal_connect (button, "clicked", G_CALLBACK(gtk_assert_dialog_copy_callback), dlg); } +#endif // wxUSE_STACKWALKER /* add the checkbutton */ dlg->shownexttime = gtk_check_button_new_with_mnemonic("Show this _dialog the next time"); @@ -372,6 +382,8 @@ gchar *gtk_assert_dialog_get_message (GtkAssertDialog *dlg) return g_strdup (gtk_label_get_text (GTK_LABEL(dlg->message))); } +#if wxUSE_STACKWALKER + gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg) { gchar *function, *sourcefile, *linenum; @@ -472,9 +484,13 @@ void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg, g_string_free (linenum, TRUE); } +#endif // wxUSE_STACKWALKER + GtkWidget *gtk_assert_dialog_new(void) { void* dialog = g_object_new(GTK_TYPE_ASSERT_DIALOG, NULL); return GTK_WIDGET (dialog); } + +#endif // wxDEBUG_LEVEL