From f3756ff85a32f4b2a0771d0ac3bd78a69535395f Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 3 Jun 2011 11:44:52 +0100 Subject: Use generic headers in preparation for GTK+ 3 transition Fixed bugs: - https://launchpad.net/bugs/792263 (bzr r10252.1.1) --- src/helper/unit-menu.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/helper/unit-menu.cpp') diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index e4ff09829..5494aaaeb 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -17,10 +17,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include -#include -#include -#include +#include #include "helper/sp-marshal.h" #include "helper/units.h" #include "helper/unit-menu.h" -- cgit v1.2.3 From a1f1e29a8a207ea7ef4be583a050778cf2875217 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 13 Jun 2011 01:28:49 +0100 Subject: Replace deprecated GtkSignal (bzr r10282.1.1) --- src/helper/unit-menu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/helper/unit-menu.cpp') diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index 5494aaaeb..bcc8589e2 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -205,7 +205,7 @@ spus_unit_activate(GtkWidget *widget, SPUnitSelector *us) /* when the base changes, signal all the adjustments to get them * to recalculate */ for (GSList *l = us->adjustments; l != NULL; l = g_slist_next(l)) { - gtk_signal_emit_by_name(GTK_OBJECT(l->data), "value_changed"); + g_signal_emit_by_name(G_OBJECT(l->data), "value_changed"); } } @@ -233,7 +233,7 @@ spus_rebuild_menu(SPUnitSelector *us) GtkWidget *i = gtk_menu_item_new_with_label( u->abbr ); gtk_object_set_data(GTK_OBJECT(i), "unit", (gpointer) u); - gtk_signal_connect(GTK_OBJECT(i), "activate", GTK_SIGNAL_FUNC(spus_unit_activate), us); + g_signal_connect(G_OBJECT(i), "activate", G_CALLBACK(spus_unit_activate), us); sp_set_font_size_smaller (i); -- cgit v1.2.3 From 59e1bb938278f59e0e2dbc2d179230b5f73467b6 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 26 Jun 2011 00:29:40 +0100 Subject: Gtk cleanup: gtk_object_set_data (bzr r10350.1.5) --- src/helper/unit-menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/helper/unit-menu.cpp') diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index bcc8589e2..80ea216b3 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -232,7 +232,7 @@ spus_rebuild_menu(SPUnitSelector *us) // i = gtk_menu_item_new_with_label((us->abbr) ? (us->plural) ? u->abbr_plural : u->abbr : (us->plural) ? u->plural : u->name); GtkWidget *i = gtk_menu_item_new_with_label( u->abbr ); - gtk_object_set_data(GTK_OBJECT(i), "unit", (gpointer) u); + g_object_set_data(G_OBJECT(i), "unit", (gpointer) u); g_signal_connect(G_OBJECT(i), "activate", G_CALLBACK(spus_unit_activate), us); sp_set_font_size_smaller (i); -- cgit v1.2.3 From 49998c62a04c371d3b9951daa6447cd1de8ba7f8 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 26 Jun 2011 02:00:32 +0100 Subject: Gtk cleanup: gtk_object_get_data (bzr r10350.1.8) --- src/helper/unit-menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/helper/unit-menu.cpp') diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index 80ea216b3..dc65c3d14 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -163,7 +163,7 @@ sp_unit_selector_get_unit(SPUnitSelector const *us) static void spus_unit_activate(GtkWidget *widget, SPUnitSelector *us) { - SPUnit const *unit = (SPUnit const *) gtk_object_get_data(GTK_OBJECT(widget), "unit"); + SPUnit const *unit = (SPUnit const *) g_object_get_data(G_OBJECT(widget), "unit"); g_return_if_fail(unit != NULL); #ifdef UNIT_SELECTOR_VERBOSE -- cgit v1.2.3 From cb302be5567e13d38c794debb7a68bbf5f4abd1e Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 2 Jul 2011 12:17:50 +0100 Subject: GTK+ cleaning: gtk_type_new (bzr r10390.1.3) --- src/helper/unit-menu.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/helper/unit-menu.cpp') diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index dc65c3d14..4b72a7566 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -79,12 +79,7 @@ GType sp_unit_selector_get_type(void) static void sp_unit_selector_class_init(SPUnitSelectorClass *klass) { - GObjectClass *object_class; - GtkWidgetClass *widget_class; - - object_class = G_OBJECT_CLASS(klass); - widget_class = GTK_WIDGET_CLASS(klass); - + GObjectClass *object_class = G_OBJECT_CLASS(klass); unit_selector_parent_class = (GtkHBoxClass*)gtk_type_class(GTK_TYPE_HBOX); signals[SET_UNIT] = g_signal_new("set_unit", @@ -138,7 +133,7 @@ sp_unit_selector_finalize(GObject *object) GtkWidget * sp_unit_selector_new(guint bases) { - SPUnitSelector *us = (SPUnitSelector*)gtk_type_new(SP_TYPE_UNIT_SELECTOR); + SPUnitSelector *us = (SPUnitSelector*)g_object_new(SP_TYPE_UNIT_SELECTOR, NULL); sp_unit_selector_set_bases(us, bases); -- cgit v1.2.3 From 32cbae2ea15712efd9a36f43f7690268c1767e52 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sun, 3 Jul 2011 11:43:53 +0100 Subject: GTK+ cleanup: gtk_type_class (bzr r10407) --- src/helper/unit-menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/helper/unit-menu.cpp') diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index 4b72a7566..a87ac4abd 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -80,7 +80,7 @@ static void sp_unit_selector_class_init(SPUnitSelectorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); - unit_selector_parent_class = (GtkHBoxClass*)gtk_type_class(GTK_TYPE_HBOX); + unit_selector_parent_class = (GtkHBoxClass*)g_type_class_peek_parent(klass); signals[SET_UNIT] = g_signal_new("set_unit", G_TYPE_FROM_CLASS(klass), -- cgit v1.2.3