diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
| commit | e65a02ed32b78534739aba24929ece7c44dd967f (patch) | |
| tree | 13cf022f18f6b5bae46aad4bc339e512f069a514 /src/helper | |
| parent | Pull 2Geom revision 2013 (extra constructors for Rect). (diff) | |
| parent | Text edit dialog: Apply button should grab default only after adding to window (diff) | |
| download | inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.tar.gz inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.zip | |
Merge from trunk
(bzr r10347.1.5)
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/helper/unit-menu.cpp | 15 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt index 8137487e2..1d6a82e41 100644 --- a/src/helper/CMakeLists.txt +++ b/src/helper/CMakeLists.txt @@ -1,5 +1,5 @@ -include(UseGlibMarshal) +include(${CMAKE_SOURCE_DIR}/CMakeScripts/UseGlibMarshal.cmake) GLIB_MARSHAL(sp_marshal sp-marshal "${CMAKE_CURRENT_BINARY_DIR}/helper") @@ -46,5 +46,7 @@ set(helper_SRC window.h ) +set_source_files_properties(sp_marshal_SRC PROPERTIES GENERATED true) + # add_inkscape_lib(helper_LIB "${helper_SRC}") add_inkscape_source("${helper_SRC}") diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index bcc8589e2..a87ac4abd 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -79,13 +79,8 @@ 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); - - unit_selector_parent_class = (GtkHBoxClass*)gtk_type_class(GTK_TYPE_HBOX); + GObjectClass *object_class = G_OBJECT_CLASS(klass); + unit_selector_parent_class = (GtkHBoxClass*)g_type_class_peek_parent(klass); signals[SET_UNIT] = g_signal_new("set_unit", G_TYPE_FROM_CLASS(klass), @@ -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); @@ -163,7 +158,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 @@ -232,7 +227,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); |