From a481bbc3186566a480def4724eecc963bc83138f Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 30 Mar 2011 05:35:24 +0000 Subject: [PATCH] convert assertdlg_gtk to C++ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 16 +- build/bakefiles/files.bkl | 2 +- include/wx/gtk/assertdlg_gtk.h | 18 +- src/gtk/assertdlg_gtk.c | 507 --------------------------------- src/gtk/assertdlg_gtk.cpp | 69 ++--- src/gtk/utilsgtk.cpp | 19 +- 6 files changed, 44 insertions(+), 587 deletions(-) delete mode 100644 src/gtk/assertdlg_gtk.c diff --git a/Makefile.in b/Makefile.in index f12ceb16e3..7b224da449 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17676,8 +17676,8 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/app.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp @@ -22971,8 +22971,8 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/app.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp @@ -28446,8 +28446,8 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/app.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp @@ -32424,8 +32424,8 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_app.o: $(srcdir)/src/gtk/app.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/app.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.c $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.c +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_assertdlg_gtk.o: $(srcdir)/src/gtk/assertdlg_gtk.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/assertdlg_gtk.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_bitmap.o: $(srcdir)/src/gtk/bitmap.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/bitmap.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 91bbedc40a..2f8bc727a1 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1067,7 +1067,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/icon.cpp src/generic/paletteg.cpp src/gtk/app.cpp - src/gtk/assertdlg_gtk.c + src/gtk/assertdlg_gtk.cpp src/gtk/bitmap.cpp src/gtk/brush.cpp src/gtk/clipbrd.cpp diff --git a/include/wx/gtk/assertdlg_gtk.h b/include/wx/gtk/assertdlg_gtk.h index 130403d455..4842c7c202 100644 --- a/include/wx/gtk/assertdlg_gtk.h +++ b/include/wx/gtk/assertdlg_gtk.h @@ -7,14 +7,8 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////// */ -#ifndef __GTK_ASSERTDLG_H__ -#define __GTK_ASSERTDLG_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include +#ifndef _WX_GTK_ASSERTDLG_H_ +#define _WX_GTK_ASSERTDLG_H_ #define GTK_TYPE_ASSERT_DIALOG (gtk_assert_dialog_get_type ()) #define GTK_ASSERT_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ASSERT_DIALOG, GtkAssertDialog)) @@ -82,10 +76,4 @@ void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg, const gchar *sourcefile, guint line_number); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __GTK_ASSERTDLG_H__ */ - - +#endif /* _WX_GTK_ASSERTDLG_H_ */ diff --git a/src/gtk/assertdlg_gtk.c b/src/gtk/assertdlg_gtk.c deleted file mode 100644 index e71571bd75..0000000000 --- a/src/gtk/assertdlg_gtk.c +++ /dev/null @@ -1,507 +0,0 @@ -/* /////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/assertdlg_gtk.c -// Purpose: GtkAssertDialog -// Author: Francesco Montorsi -// Id: $Id$ -// Copyright: (c) 2006 Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////// */ - -#ifdef VMS -#define XCheckIfEvent XCHECKIFEVENT -#endif - -#include "wx/platform.h" -#include "wx/gtk/assertdlg_gtk.h" - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include - -/* For FILE */ -#include - - -/* ---------------------------------------------------------------------------- - Constants - ---------------------------------------------------------------------------- */ - -/* - NB: when changing order of the columns also update the gtk_list_store_new() call - in gtk_assert_dialog_create_backtrace_list_model() function - */ -#define STACKFRAME_LEVEL_COLIDX 0 -#define FUNCTION_NAME_COLIDX 1 -#define SOURCE_FILE_COLIDX 2 -#define LINE_NUMBER_COLIDX 3 -#define FUNCTION_ARGS_COLIDX 4 - - - - -/* ---------------------------------------------------------------------------- - GtkAssertDialog helpers - ---------------------------------------------------------------------------- */ - -GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label, - const gchar *stock, gint response_id) -{ - /* create the button */ - GtkWidget *button = gtk_button_new_with_mnemonic (label); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); - -#if GTK_CHECK_VERSION(2,6,0) - if (!gtk_check_version (2, 6, 0)) - { - /* add a stock icon inside it */ - GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (button), image); - } -#endif - - /* add to the given (container) widget */ - if (box) - gtk_box_pack_end (box, button, FALSE, TRUE, 8); - - return button; -} - -GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *label, - const gchar *stock, gint response_id) -{ - /* create the button */ - GtkWidget *button = gtk_assert_dialog_add_button_to (NULL, label, stock, response_id); - - /* add the button to the dialog's action area */ - gtk_dialog_add_action_widget (GTK_DIALOG (dlg), button, response_id); - - return button; -} - -void gtk_assert_dialog_append_text_column (GtkWidget *treeview, const gchar *name, int index) -{ - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (name, renderer, - "text", index, NULL); - gtk_tree_view_insert_column (GTK_TREE_VIEW (treeview), column, index); - gtk_tree_view_column_set_resizable (column, TRUE); - gtk_tree_view_column_set_reorderable (column, TRUE); -} - -GtkWidget *gtk_assert_dialog_create_backtrace_list_model () -{ - GtkListStore *store; - GtkWidget *treeview; - - /* create list store */ - store = gtk_list_store_new (5, - G_TYPE_UINT, /* stack frame number */ - G_TYPE_STRING, /* function name */ - G_TYPE_STRING, /* source file name */ - G_TYPE_STRING, /* line number */ - G_TYPE_STRING); /* function arguments */ - - /* create the tree view */ - treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL(store)); - g_object_unref (store); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE); - - /* append columns */ - gtk_assert_dialog_append_text_column(treeview, "#", STACKFRAME_LEVEL_COLIDX); - gtk_assert_dialog_append_text_column(treeview, "Function name", FUNCTION_NAME_COLIDX); - gtk_assert_dialog_append_text_column(treeview, "Function args", FUNCTION_ARGS_COLIDX); - gtk_assert_dialog_append_text_column(treeview, "Source file", SOURCE_FILE_COLIDX); - gtk_assert_dialog_append_text_column(treeview, "Line #", LINE_NUMBER_COLIDX); - - return treeview; -} - -void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg) -{ - /* set busy cursor */ - GdkWindow *parent = GTK_WIDGET(dlg)->window; - GdkCursor *cur = gdk_cursor_new (GDK_WATCH); - gdk_window_set_cursor (parent, cur); - gdk_flush (); - - (*dlg->callback)(dlg->userdata); - - /* toggle busy cursor */ - gdk_window_set_cursor (parent, NULL); - gdk_cursor_unref (cur); -} - - - -/* ---------------------------------------------------------------------------- - GtkAssertDialog signal handlers - ---------------------------------------------------------------------------- */ - -void gtk_assert_dialog_expander_callback (GtkWidget *widget, GtkAssertDialog *dlg) -{ - /* status is not yet updated so we need to invert it to get the new one */ - gboolean expanded = !gtk_expander_get_expanded (GTK_EXPANDER(dlg->expander)); - gtk_window_set_resizable (GTK_WINDOW (dlg), expanded); - - if (dlg->callback == NULL) /* was the backtrace already processed? */ - return; - - gtk_assert_dialog_process_backtrace (dlg); - - /* mark the work as done (so that next activate we won't call the callback again) */ - dlg->callback = NULL; -} - -void gtk_assert_dialog_save_backtrace_callback (GtkWidget *widget, GtkAssertDialog *dlg) -{ - GtkWidget *dialog; - - dialog = gtk_file_chooser_dialog_new ("Save assert info to file", GTK_WINDOW(dlg), - GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - NULL); - - if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) - { - char *filename, *msg, *backtrace; - FILE *fp; - - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - if ( filename ) - { - msg = gtk_assert_dialog_get_message (dlg); - backtrace = gtk_assert_dialog_get_backtrace (dlg); - - /* open the file and write all info inside it */ - fp = fopen (filename, "w"); - if (fp) - { - fprintf (fp, "ASSERT INFO:\n%s\n\nBACKTRACE:\n%s", msg, backtrace); - fclose (fp); - } - - g_free (filename); - g_free (msg); - g_free (backtrace); - } - } - - gtk_widget_destroy (dialog); -} - -void gtk_assert_dialog_copy_callback (GtkWidget *widget, GtkAssertDialog *dlg) -{ - char *msg, *backtrace; - GtkClipboard *clipboard; - GString *str; - - msg = gtk_assert_dialog_get_message (dlg); - backtrace = gtk_assert_dialog_get_backtrace (dlg); - - /* combine both in a single string */ - str = g_string_new(""); - g_string_printf (str, "ASSERT INFO:\n%s\n\nBACKTRACE:\n%s\n\n", msg, backtrace); - - /* copy everything in default clipboard */ - clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); - gtk_clipboard_set_text (clipboard, str->str, str->len); - - /* copy everything in primary clipboard too */ - clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); - gtk_clipboard_set_text (clipboard, str->str, str->len); - - g_free (msg); - g_free (backtrace); - g_string_free (str, TRUE); -} - -void gtk_assert_dialog_continue_callback (GtkWidget *widget, GtkAssertDialog *dlg) -{ - gint response = - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(dlg->shownexttime)) ? - GTK_ASSERT_DIALOG_CONTINUE : GTK_ASSERT_DIALOG_CONTINUE_SUPPRESSING; - - gtk_dialog_response (GTK_DIALOG(dlg), response); -} - - -/* ---------------------------------------------------------------------------- - GtkAssertDialogClass implementation - ---------------------------------------------------------------------------- */ - -static void gtk_assert_dialog_init (GtkAssertDialog *self); -static void gtk_assert_dialog_class_init (GtkAssertDialogClass *klass); - - -GtkType gtk_assert_dialog_get_type (void) -{ - static GtkType assert_dialog_type = 0; - - if (!assert_dialog_type) - { - const GTypeInfo assert_dialog_info = - { - sizeof (GtkAssertDialogClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_assert_dialog_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkAssertDialog), - 16, /* n_preallocs */ - (GInstanceInitFunc) gtk_assert_dialog_init, - NULL - }; - assert_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkAssertDialog", &assert_dialog_info, (GTypeFlags)0); - } - - return assert_dialog_type; -} - -void gtk_assert_dialog_class_init(GtkAssertDialogClass *klass) -{ - /* no special initializations required */ -} - -void gtk_assert_dialog_init(GtkAssertDialog *dlg) -{ - GtkWidget *continuebtn; - - { - GtkWidget *vbox, *hbox, *image; - - /* start the main vbox */ - gtk_widget_push_composite_child (); - vbox = gtk_vbox_new (FALSE, 8); - gtk_container_set_border_width (GTK_CONTAINER(vbox), 8); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 5); - - - /* add the icon+message hbox */ - hbox = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - - /* icon */ - image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 12); - - { - GtkWidget *vbox2, *info; - - /* message */ - vbox2 = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0); - info = gtk_label_new ("An assertion failed!"); - gtk_box_pack_start (GTK_BOX(vbox2), info, TRUE, TRUE, 8); - - /* assert message */ - dlg->message = gtk_label_new (NULL); - gtk_label_set_selectable (GTK_LABEL (dlg->message), TRUE); - gtk_label_set_line_wrap (GTK_LABEL (dlg->message), TRUE); - gtk_label_set_justify (GTK_LABEL (dlg->message), GTK_JUSTIFY_LEFT); - gtk_widget_set_size_request (GTK_WIDGET(dlg->message), 450, -1); - - gtk_box_pack_end (GTK_BOX(vbox2), GTK_WIDGET(dlg->message), TRUE, TRUE, 8); - } - - /* 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 (GTK_EXPANDER(dlg->expander), "activate", - G_CALLBACK(gtk_assert_dialog_expander_callback), dlg); - } - - { - GtkWidget *hbox, *vbox, *button, *sw; - - /* create expander's vbox */ - vbox = gtk_vbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (dlg->expander), vbox); - - /* add a scrollable window under the expander */ - sw = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_ETCHED_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX(vbox), sw, TRUE, TRUE, 8); - - /* add the treeview to the scrollable window */ - dlg->treeview = gtk_assert_dialog_create_backtrace_list_model (); - gtk_widget_set_size_request (GTK_WIDGET(dlg->treeview), -1, 180); - gtk_container_add (GTK_CONTAINER (sw), dlg->treeview); - - /* create button's hbox */ - hbox = gtk_hbutton_box_new (); - gtk_box_pack_end (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - gtk_button_box_set_layout (GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END); - - /* add the buttons */ - button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Save to _file", - GTK_STOCK_SAVE, GTK_RESPONSE_NONE); - g_signal_connect (button, "clicked", - G_CALLBACK(gtk_assert_dialog_save_backtrace_callback), dlg); - - button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Copy to clip_board", - GTK_STOCK_COPY, GTK_RESPONSE_NONE); - g_signal_connect (button, "clicked", G_CALLBACK(gtk_assert_dialog_copy_callback), dlg); - } - - /* add the checkbutton */ - dlg->shownexttime = gtk_check_button_new_with_mnemonic("Show this _dialog the next time"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dlg->shownexttime), TRUE); - gtk_box_pack_end (GTK_BOX(GTK_DIALOG(dlg)->action_area), dlg->shownexttime, FALSE, TRUE, 8); - - /* add the stop button */ - gtk_assert_dialog_add_button (dlg, "_Stop", GTK_STOCK_QUIT, GTK_ASSERT_DIALOG_STOP); - - /* add the continue button */ - continuebtn = gtk_assert_dialog_add_button (dlg, "_Continue", GTK_STOCK_YES, GTK_ASSERT_DIALOG_CONTINUE); - gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_ASSERT_DIALOG_CONTINUE); - g_signal_connect (continuebtn, "clicked", G_CALLBACK(gtk_assert_dialog_continue_callback), dlg); - - /* complete creation */ - dlg->callback = NULL; - dlg->userdata = NULL; - - /* the resizeable property of this window is modified by the expander: - when it's collapsed, the window must be non-resizeable! */ - gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE); - gtk_widget_pop_composite_child (); - gtk_widget_show_all (GTK_WIDGET(dlg)); -} - - - -/* ---------------------------------------------------------------------------- - GtkAssertDialog public API - ---------------------------------------------------------------------------- */ - -gchar *gtk_assert_dialog_get_message (GtkAssertDialog *dlg) -{ - /* NOTES: - 1) returned string must g_free()d ! - 2) Pango markup is automatically stripped off by GTK - */ - return g_strdup (gtk_label_get_text (GTK_LABEL(dlg->message))); -} - -gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg) -{ - gchar *function, *arguments, *sourcefile, *linenum; - guint count; - - GtkTreeModel *model; - GtkTreeIter iter; - GString *string; - - g_return_val_if_fail (GTK_IS_ASSERT_DIALOG (dlg), NULL); - model = gtk_tree_view_get_model (GTK_TREE_VIEW(dlg->treeview)); - string = g_string_new(""); - - /* iterate over the list */ - if (!gtk_tree_model_get_iter_first (model, &iter)) - return NULL; - - do - { - /* append this stack frame's info to the string */ - gtk_tree_model_get (model, &iter, - STACKFRAME_LEVEL_COLIDX, &count, - FUNCTION_NAME_COLIDX, &function, - FUNCTION_ARGS_COLIDX, &arguments, - SOURCE_FILE_COLIDX, &sourcefile, - LINE_NUMBER_COLIDX, &linenum, - -1); - - g_string_append_printf (string, "[%u] %s(%s)", - count, function, arguments); - if (sourcefile[0] != '\0') - g_string_append_printf (string, " %s", sourcefile); - if (linenum[0] != '\0') - g_string_append_printf (string, ":%s", linenum); - g_string_append (string, "\n"); - - g_free (function); - g_free (arguments); - g_free (sourcefile); - g_free (linenum); - - } while (gtk_tree_model_iter_next (model, &iter)); - - /* returned string must g_free()d */ - return g_string_free (string, FALSE); -} - -void gtk_assert_dialog_set_message(GtkAssertDialog *dlg, const gchar *msg) -{ - /* prepend and append the tag - NOTE: g_markup_printf_escaped() is not used because it's available - only for glib >= 2.4 */ - gchar *escaped_msg = g_markup_escape_text (msg, -1); - gchar *decorated_msg = g_strdup_printf ("%s", escaped_msg); - - g_return_if_fail (GTK_IS_ASSERT_DIALOG (dlg)); - gtk_label_set_markup (GTK_LABEL(dlg->message), decorated_msg); - - g_free (decorated_msg); - g_free (escaped_msg); -} - -void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg, - GtkAssertDialogStackFrameCallback callback, - void *userdata) -{ - assertdlg->callback = callback; - assertdlg->userdata = userdata; -} - -void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg, - const gchar *function, - const gchar *arguments, - const gchar *sourcefile, - guint line_number) -{ - GtkTreeModel *model; - GtkTreeIter iter; - GString *linenum; - gint count; - - g_return_if_fail (GTK_IS_ASSERT_DIALOG (dlg)); - model = gtk_tree_view_get_model (GTK_TREE_VIEW(dlg->treeview)); - - /* how many items are in the list up to now ? */ - count = gtk_tree_model_iter_n_children (model, NULL); - - linenum = g_string_new(""); - if ( line_number != 0 ) - g_string_printf (linenum, "%u", line_number); - - /* add data to the list store */ - gtk_list_store_append (GTK_LIST_STORE(model), &iter); - gtk_list_store_set (GTK_LIST_STORE(model), &iter, - STACKFRAME_LEVEL_COLIDX, count+1, /* start from 1 and not from 0 */ - FUNCTION_NAME_COLIDX, function, - FUNCTION_ARGS_COLIDX, arguments, - SOURCE_FILE_COLIDX, sourcefile, - LINE_NUMBER_COLIDX, linenum->str, - -1); - - g_string_free (linenum, TRUE); -} - -GtkWidget *gtk_assert_dialog_new(void) -{ - GtkAssertDialog *dialog = g_object_new (GTK_TYPE_ASSERT_DIALOG, NULL); - - return GTK_WIDGET (dialog); -} - -#ifdef __cplusplus -} -#endif /* __cplusplus */ diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp index e71571bd75..0adc44a408 100644 --- a/src/gtk/assertdlg_gtk.cpp +++ b/src/gtk/assertdlg_gtk.cpp @@ -1,5 +1,5 @@ /* /////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/assertdlg_gtk.c +// Name: src/gtk/assertdlg_gtk.cpp // Purpose: GtkAssertDialog // Author: Francesco Montorsi // Id: $Id$ @@ -7,22 +7,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////// */ -#ifdef VMS -#define XCheckIfEvent XCHECKIFEVENT -#endif - #include "wx/platform.h" -#include "wx/gtk/assertdlg_gtk.h" - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include - -/* For FILE */ -#include - +#include "wx/gtk/assertdlg_gtk.h" /* ---------------------------------------------------------------------------- Constants @@ -46,20 +33,15 @@ extern "C" { ---------------------------------------------------------------------------- */ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label, - const gchar *stock, gint response_id) + const gchar *stock) { /* create the button */ GtkWidget *button = gtk_button_new_with_mnemonic (label); - GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(button, true); -#if GTK_CHECK_VERSION(2,6,0) - if (!gtk_check_version (2, 6, 0)) - { - /* add a stock icon inside it */ - GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON); - gtk_button_set_image (GTK_BUTTON (button), image); - } -#endif + /* add a stock icon inside it */ + GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (button), image); /* add to the given (container) widget */ if (box) @@ -72,7 +54,7 @@ GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *labe const gchar *stock, gint response_id) { /* create the button */ - GtkWidget *button = gtk_assert_dialog_add_button_to (NULL, label, stock, response_id); + GtkWidget* button = gtk_assert_dialog_add_button_to(NULL, label, stock); /* add the button to the dialog's action area */ gtk_dialog_add_action_widget (GTK_DIALOG (dlg), button, response_id); @@ -124,7 +106,7 @@ GtkWidget *gtk_assert_dialog_create_backtrace_list_model () void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg) { /* set busy cursor */ - GdkWindow *parent = GTK_WIDGET(dlg)->window; + GdkWindow *parent = gtk_widget_get_window(GTK_WIDGET(dlg)); GdkCursor *cur = gdk_cursor_new (GDK_WATCH); gdk_window_set_cursor (parent, cur); gdk_flush (); @@ -138,11 +120,12 @@ void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg) +extern "C" { /* ---------------------------------------------------------------------------- GtkAssertDialog signal handlers ---------------------------------------------------------------------------- */ -void gtk_assert_dialog_expander_callback (GtkWidget *widget, GtkAssertDialog *dlg) +static void gtk_assert_dialog_expander_callback(GtkWidget*, GtkAssertDialog* dlg) { /* status is not yet updated so we need to invert it to get the new one */ gboolean expanded = !gtk_expander_get_expanded (GTK_EXPANDER(dlg->expander)); @@ -157,7 +140,7 @@ void gtk_assert_dialog_expander_callback (GtkWidget *widget, GtkAssertDialog *dl dlg->callback = NULL; } -void gtk_assert_dialog_save_backtrace_callback (GtkWidget *widget, GtkAssertDialog *dlg) +static void gtk_assert_dialog_save_backtrace_callback(GtkWidget*, GtkAssertDialog* dlg) { GtkWidget *dialog; @@ -195,7 +178,7 @@ void gtk_assert_dialog_save_backtrace_callback (GtkWidget *widget, GtkAssertDial gtk_widget_destroy (dialog); } -void gtk_assert_dialog_copy_callback (GtkWidget *widget, GtkAssertDialog *dlg) +static void gtk_assert_dialog_copy_callback(GtkWidget*, GtkAssertDialog* dlg) { char *msg, *backtrace; GtkClipboard *clipboard; @@ -221,7 +204,7 @@ void gtk_assert_dialog_copy_callback (GtkWidget *widget, GtkAssertDialog *dlg) g_string_free (str, TRUE); } -void gtk_assert_dialog_continue_callback (GtkWidget *widget, GtkAssertDialog *dlg) +static void gtk_assert_dialog_continue_callback(GtkWidget*, GtkAssertDialog* dlg) { gint response = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(dlg->shownexttime)) ? @@ -229,7 +212,7 @@ void gtk_assert_dialog_continue_callback (GtkWidget *widget, GtkAssertDialog *dl gtk_dialog_response (GTK_DIALOG(dlg), response); } - +} // extern "C" /* ---------------------------------------------------------------------------- GtkAssertDialogClass implementation @@ -239,9 +222,9 @@ static void gtk_assert_dialog_init (GtkAssertDialog *sel static void gtk_assert_dialog_class_init (GtkAssertDialogClass *klass); -GtkType gtk_assert_dialog_get_type (void) +GType gtk_assert_dialog_get_type() { - static GtkType assert_dialog_type = 0; + static GType assert_dialog_type; if (!assert_dialog_type) { @@ -264,12 +247,12 @@ GtkType gtk_assert_dialog_get_type (void) return assert_dialog_type; } -void gtk_assert_dialog_class_init(GtkAssertDialogClass *klass) +static void gtk_assert_dialog_class_init(GtkAssertDialogClass*) { /* no special initializations required */ } -void gtk_assert_dialog_init(GtkAssertDialog *dlg) +static void gtk_assert_dialog_init(GtkAssertDialog* dlg) { GtkWidget *continuebtn; @@ -280,7 +263,7 @@ void gtk_assert_dialog_init(GtkAssertDialog *dlg) gtk_widget_push_composite_child (); vbox = gtk_vbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER(vbox), 8); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 5); + gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), vbox, true, true, 5); /* add the icon+message hbox */ @@ -343,19 +326,19 @@ void gtk_assert_dialog_init(GtkAssertDialog *dlg) /* add the buttons */ button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Save to _file", - GTK_STOCK_SAVE, GTK_RESPONSE_NONE); + GTK_STOCK_SAVE); g_signal_connect (button, "clicked", G_CALLBACK(gtk_assert_dialog_save_backtrace_callback), dlg); button = gtk_assert_dialog_add_button_to (GTK_BOX(hbox), "Copy to clip_board", - GTK_STOCK_COPY, GTK_RESPONSE_NONE); + GTK_STOCK_COPY); g_signal_connect (button, "clicked", G_CALLBACK(gtk_assert_dialog_copy_callback), dlg); } /* add the checkbutton */ dlg->shownexttime = gtk_check_button_new_with_mnemonic("Show this _dialog the next time"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(dlg->shownexttime), TRUE); - gtk_box_pack_end (GTK_BOX(GTK_DIALOG(dlg)->action_area), dlg->shownexttime, FALSE, TRUE, 8); + gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dlg))), dlg->shownexttime, false, true, 8); /* add the stop button */ gtk_assert_dialog_add_button (dlg, "_Stop", GTK_STOCK_QUIT, GTK_ASSERT_DIALOG_STOP); @@ -497,11 +480,7 @@ void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg, GtkWidget *gtk_assert_dialog_new(void) { - GtkAssertDialog *dialog = g_object_new (GTK_TYPE_ASSERT_DIALOG, NULL); + void* dialog = g_object_new(GTK_TYPE_ASSERT_DIALOG, NULL); return GTK_WIDGET (dialog); } - -#ifdef __cplusplus -} -#endif /* __cplusplus */ diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 774358195e..74525871e4 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -26,6 +26,9 @@ #include "wx/gtk/private/timer.h" #include "wx/evtloop.h" +#include +#include + #if wxDEBUG_LEVEL #include "wx/gtk/assertdlg_gtk.h" #if wxUSE_STACKWALKER @@ -40,9 +43,6 @@ #include // for WNOHANG #include -#include -#include - #if wxUSE_DETECT_SM #include @@ -322,14 +322,11 @@ private: GtkAssertDialog *m_dlg; }; -// the callback functions must be extern "C" to comply with GTK+ declarations -extern "C" +static void get_stackframe_callback(void* p) { - void get_stackframe_callback(StackDump *dump) - { - // skip over frames up to including wxOnAssert() - dump->ProcessFrames(3); - } + StackDump* dump = static_cast(p); + // skip over frames up to including wxOnAssert() + dump->ProcessFrames(3); } #endif // wxDEBUG_LEVEL && wxUSE_STACKWALKER @@ -356,7 +353,7 @@ bool wxGUIAppTraits::ShowAssertDialog(const wxString& msg) gtk_assert_dialog_set_backtrace_callback ( GTK_ASSERT_DIALOG(dialog), - (GtkAssertDialogStackFrameCallback)get_stackframe_callback, + get_stackframe_callback, &dump ); #endif // wxUSE_STACKWALKER -- 2.47.2