Remove some old redundant code

[wxWidgets.git] / src / gtk / assertdlg_gtk.cpp

diff --git a/src/gtk/assertdlg_gtk.cpp b/src/gtk/assertdlg_gtk.cpp
index 1ec690b733bc573fd4cc3e00e4fd170082c11e14..a495ce7ace5135817f71187173b2487e38a63af9 100644 (file)
--- a/src/gtk/assertdlg_gtk.cpp
+++ b/src/gtk/assertdlg_gtk.cpp
@@ -2,14 +2,14 @@
 // Name:        src/gtk/assertdlg_gtk.cpp
 // Purpose:     GtkAssertDialog
 // Author:      Francesco Montorsi
 // Name:        src/gtk/assertdlg_gtk.cpp
 // Purpose:     GtkAssertDialog
 // Author:      Francesco Montorsi

-// Id:          $Id$

 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
 #include "wx/wxprec.h"
 
 // Copyright:   (c) 2006 Francesco Montorsi
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////// */
 
 #include "wx/wxprec.h"
 

-#include "wx/platform.h"
+#if wxDEBUG_LEVEL
+

 #include <gtk/gtk.h>
 #include "wx/gtk/assertdlg_gtk.h"
 #include "wx/gtk/private/gtk2-compat.h"
 #include <gtk/gtk.h>
 #include "wx/gtk/assertdlg_gtk.h"
 #include "wx/gtk/private/gtk2-compat.h"


@@ -29,13 +29,11 @@
 #define SOURCE_FILE_COLIDX             2
 #define LINE_NUMBER_COLIDX             3
 
 #define SOURCE_FILE_COLIDX             2
 #define LINE_NUMBER_COLIDX             3
 

-
-
-

 /* ----------------------------------------------------------------------------
    GtkAssertDialog helpers
  ---------------------------------------------------------------------------- */
 
 /* ----------------------------------------------------------------------------
    GtkAssertDialog helpers
  ---------------------------------------------------------------------------- */
 

+static

 GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
                                             const gchar *stock)
 {
 GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
                                             const gchar *stock)
 {


@@ -45,9 +43,7 @@ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
 
     /* add a stock icon inside it */
     GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
 
     /* add a stock icon inside it */
     GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);

-#if GTK_CHECK_VERSION(2,6,0)

     gtk_button_set_image (GTK_BUTTON (button), image);
     gtk_button_set_image (GTK_BUTTON (button), image);

-#endif

 
     /* add to the given (container) widget */
     if (box)
 
     /* add to the given (container) widget */
     if (box)


@@ -56,6 +52,7 @@ GtkWidget *gtk_assert_dialog_add_button_to (GtkBox *box, const gchar *label,
     return button;
 }
 
     return button;
 }
 

+static

 GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *label,
                                          const gchar *stock, gint response_id)
 {
 GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *label,
                                          const gchar *stock, gint response_id)
 {


@@ -68,6 +65,9 @@ GtkWidget *gtk_assert_dialog_add_button (GtkAssertDialog *dlg, const gchar *labe
     return button;
 }
 
     return button;
 }
 

+#if wxUSE_STACKWALKER
+
+static

 void gtk_assert_dialog_append_text_column (GtkWidget *treeview, const gchar *name, int index)
 {
     GtkCellRenderer *renderer;
 void gtk_assert_dialog_append_text_column (GtkWidget *treeview, const gchar *name, int index)
 {
     GtkCellRenderer *renderer;


@@ -81,6 +81,7 @@ void gtk_assert_dialog_append_text_column (GtkWidget *treeview, const gchar *nam
     gtk_tree_view_column_set_reorderable (column, TRUE);
 }
 
     gtk_tree_view_column_set_reorderable (column, TRUE);
 }
 

+static

 GtkWidget *gtk_assert_dialog_create_backtrace_list_model ()
 {
     GtkListStore *store;
 GtkWidget *gtk_assert_dialog_create_backtrace_list_model ()
 {
     GtkListStore *store;


@@ -107,6 +108,7 @@ GtkWidget *gtk_assert_dialog_create_backtrace_list_model ()
     return treeview;
 }
 
     return treeview;
 }
 

+static

 void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg)
 {
     /* set busy cursor */
 void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg)
 {
     /* set busy cursor */


@@ -119,11 +121,13 @@ void gtk_assert_dialog_process_backtrace (GtkAssertDialog *dlg)
 
     /* toggle busy cursor */
     gdk_window_set_cursor (parent, NULL);
 
     /* toggle busy cursor */
     gdk_window_set_cursor (parent, NULL);

+#ifdef __WXGTK3__
+    g_object_unref(cur);
+#else

     gdk_cursor_unref (cur);
     gdk_cursor_unref (cur);

+#endif

 }
 
 }
 

-
-

 extern "C" {
 /* ----------------------------------------------------------------------------
    GtkAssertDialog signal handlers
 extern "C" {
 /* ----------------------------------------------------------------------------
    GtkAssertDialog signal handlers


@@ -207,7 +211,11 @@ static void gtk_assert_dialog_copy_callback(GtkWidget*, GtkAssertDialog* dlg)
     g_free (backtrace);
     g_string_free (str, TRUE);
 }
     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 =
 static void gtk_assert_dialog_continue_callback(GtkWidget*, GtkAssertDialog* dlg)
 {
     gint response =


@@ -222,9 +230,9 @@ static void gtk_assert_dialog_continue_callback(GtkWidget*, GtkAssertDialog* dlg
    GtkAssertDialogClass implementation
  ---------------------------------------------------------------------------- */
 
    GtkAssertDialogClass implementation
  ---------------------------------------------------------------------------- */
 

-static void     gtk_assert_dialog_init              (GtkAssertDialog        *self);
-static void     gtk_assert_dialog_class_init        (GtkAssertDialogClass *klass);
-
+extern "C" {
+static void gtk_assert_dialog_init(GTypeInstance* instance, void*);
+}

 
 GType gtk_assert_dialog_get_type()
 {
 
 GType gtk_assert_dialog_get_type()
 {


@@ -237,12 +245,12 @@ GType gtk_assert_dialog_get_type()
             sizeof (GtkAssertDialogClass),
             NULL,           /* base_init */
             NULL,           /* base_finalize */
             sizeof (GtkAssertDialogClass),
             NULL,           /* base_init */
             NULL,           /* base_finalize */

-            (GClassInitFunc) gtk_assert_dialog_class_init,
+            NULL,

             NULL,           /* class_finalize */
             NULL,           /* class_data */
             sizeof (GtkAssertDialog),
             16,             /* n_preallocs */
             NULL,           /* class_finalize */
             NULL,           /* class_data */
             sizeof (GtkAssertDialog),
             16,             /* n_preallocs */

-            (GInstanceInitFunc) gtk_assert_dialog_init,
+            gtk_assert_dialog_init,

             NULL
         };
         assert_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkAssertDialog", &assert_dialog_info, (GTypeFlags)0);
             NULL
         };
         assert_dialog_type = g_type_register_static (GTK_TYPE_DIALOG, "GtkAssertDialog", &assert_dialog_info, (GTypeFlags)0);


@@ -251,13 +259,10 @@ GType gtk_assert_dialog_get_type()
     return assert_dialog_type;
 }
 
     return assert_dialog_type;
 }
 

-static void gtk_assert_dialog_class_init(GtkAssertDialogClass*)
-{
-    /* no special initializations required */
-}
-
-static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
+extern "C" {
+static void gtk_assert_dialog_init(GTypeInstance* instance, void*)

 {
 {

+    GtkAssertDialog* dlg = GTK_ASSERT_DIALOG(instance);

     GtkWidget *continuebtn;
 
     {
     GtkWidget *continuebtn;
 
     {


@@ -265,13 +270,13 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
 
         /* start the main vbox */
         gtk_widget_push_composite_child ();
 
         /* start the main vbox */
         gtk_widget_push_composite_child ();

-        vbox = gtk_vbox_new (FALSE, 8);
+        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);

         gtk_container_set_border_width (GTK_CONTAINER(vbox), 8);
         gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), vbox, true, true, 5);
 
 
         /* add the icon+message hbox */
         gtk_container_set_border_width (GTK_CONTAINER(vbox), 8);
         gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dlg))), vbox, true, true, 5);
 
 
         /* add the icon+message hbox */

-        hbox = gtk_hbox_new (FALSE, 0);
+        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);

         gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
         /* icon */
         gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
         /* icon */


@@ -282,7 +287,7 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
             GtkWidget *vbox2, *info;
 
             /* message */
             GtkWidget *vbox2, *info;
 
             /* message */

-            vbox2 = gtk_vbox_new (FALSE, 0);
+            vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 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);
             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);


@@ -297,18 +302,20 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
             gtk_box_pack_end (GTK_BOX(vbox2), GTK_WIDGET(dlg->message), TRUE, TRUE, 8);
         }
 
             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);
         /* 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_signal_connect (dlg->expander, "activate",

                             G_CALLBACK(gtk_assert_dialog_expander_callback), dlg);
                             G_CALLBACK(gtk_assert_dialog_expander_callback), dlg);

+#endif // wxUSE_STACKWALKER

     }
     }

-
+#if wxUSE_STACKWALKER

     {
         GtkWidget *hbox, *vbox, *button, *sw;
 
         /* create expander's vbox */
     {
         GtkWidget *hbox, *vbox, *button, *sw;
 
         /* create expander's vbox */

-        vbox = gtk_vbox_new (FALSE, 0);
+        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);

         gtk_container_add (GTK_CONTAINER (dlg->expander), vbox);
 
         /* add a scrollable window under the expander */
         gtk_container_add (GTK_CONTAINER (dlg->expander), vbox);
 
         /* add a scrollable window under the expander */


@@ -324,7 +331,7 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
         gtk_container_add (GTK_CONTAINER (sw), dlg->treeview);
 
         /* create button's hbox */
         gtk_container_add (GTK_CONTAINER (sw), dlg->treeview);
 
         /* create button's hbox */

-        hbox = gtk_hbutton_box_new ();
+        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);

         gtk_box_pack_end (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
         gtk_button_box_set_layout (GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
 
         gtk_box_pack_end (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
         gtk_button_box_set_layout (GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
 


@@ -338,6 +345,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);
     }
                                                   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");
 
     /* add the checkbutton */
     dlg->shownexttime = gtk_check_button_new_with_mnemonic("Show this _dialog the next time");


@@ -362,8 +370,7 @@ static void gtk_assert_dialog_init(GtkAssertDialog* dlg)
     gtk_widget_pop_composite_child ();
     gtk_widget_show_all (GTK_WIDGET(dlg));
 }
     gtk_widget_pop_composite_child ();
     gtk_widget_show_all (GTK_WIDGET(dlg));
 }

-
-
+}

 
 /* ----------------------------------------------------------------------------
    GtkAssertDialog public API
 
 /* ----------------------------------------------------------------------------
    GtkAssertDialog public API


@@ -378,6 +385,8 @@ gchar *gtk_assert_dialog_get_message (GtkAssertDialog *dlg)
     return g_strdup (gtk_label_get_text (GTK_LABEL(dlg->message)));
 }
 
     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;
 gchar *gtk_assert_dialog_get_backtrace (GtkAssertDialog *dlg)
 {
     gchar *function, *sourcefile, *linenum;


@@ -423,6 +432,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)
 {
     /* prepend and append the <b> tag
 void gtk_assert_dialog_set_message(GtkAssertDialog *dlg, const gchar *msg)
 {
     /* prepend and append the <b> tag


@@ -438,6 +449,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,
                                               GtkAssertDialogStackFrameCallback callback,
                                               void *userdata)
 void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg,
                                               GtkAssertDialogStackFrameCallback callback,
                                               void *userdata)


@@ -478,9 +491,13 @@ void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg,
     g_string_free (linenum, TRUE);
 }
 
     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);
 }
 GtkWidget *gtk_assert_dialog_new(void)
 {
     void* dialog = g_object_new(GTK_TYPE_ASSERT_DIALOG, NULL);
 
     return GTK_WIDGET (dialog);
 }

+
+#endif // wxDEBUG_LEVEL