From 2fae5458f78b430d17bb92c88b07a8c5116dc29b Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sat, 27 Jul 2013 09:52:10 +0200 Subject: [PATCH] Modifiche per la compilazione con gtk3 e libgda5. --- configure.ac | 17 ++++++++--------- libterritorio.pc.in | 2 +- src/comuni.c | 8 ++++---- src/importaviecivilia.c | 3 +-- src/province.c | 8 ++++---- src/regioni.c | 6 +++--- src/stati.c | 6 +++--- src/vie.c | 8 ++++---- src/widget.c | 18 ++++++++++-------- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/configure.ac b/configure.ac index b9255b5..e2d101d 100644 --- a/configure.ac +++ b/configure.ac @@ -24,15 +24,14 @@ AC_PROG_LIBTOOL AC_PROG_RANLIB # Checks for libraries. -PKG_CHECK_MODULES(TERRITORIO, [gio-2.0 >= 2.20 - gtk+-2.0 >= 2.16 - libgda-ui-4.0 >= 4.2.0 - libgdaex >= 0.3.0 - libgtkform >= 0.3.1 - libgtkformui >= 0.3.1 - libaute >= 0.0.2 - libautoz >= 0.0.2 - libsolipa >= 0.3.1]) +PKG_CHECK_MODULES(TERRITORIO, [gio-2.0 >= 2.36 + libgda-ui-5.0 >= 5.0.0 + libgdaex >= 0.5.0 + libgtkform >= 0.5.0 + libgtkformui >= 0.5.0 + libaute >= 0.2.0 + libautoz >= 0.0.5 + libsolipa >= 0.5.0]) AC_SUBST(TERRITORIO_CFLAGS) AC_SUBST(TERRITORIO_LIBS) diff --git a/libterritorio.pc.in b/libterritorio.pc.in index 90aed00..e98cc2d 100644 --- a/libterritorio.pc.in +++ b/libterritorio.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: @PACKAGE_NAME@ Description: Libreria con l'interfaccia per la gestione del territorio. Version: @PACKAGE_VERSION@ -Requires: glib-2.0 gtk+-2.0 libgda-ui-4.0 libgdaex libgtkform libgtkformui libaute libautoz libsolipa +Requires: libgdaex >= 0.5.0 libgtkform >= 0.5.0 libgtkformui >= 0.5.0 libaute >= 0.2.0 libautoz >= 0.0.5 libsolipa >= 0.5.0 libgda-ui-5.0 >= 5.0.0 Libs: -L${libdir} -lterritorio Cflags: -I${includedir} diff --git a/src/comuni.c b/src/comuni.c index 081cc4c..ad4a4a5 100644 --- a/src/comuni.c +++ b/src/comuni.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Andrea Zagli + * Copyright (C) 2010-2013 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include @@ -457,7 +457,7 @@ territorio_comuni_on_key_release_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_KEY_Escape) { TerritorioComuniPrivate *priv = TERRITORIO_COMUNI_GET_PRIVATE ((TerritorioComuni *)user_data); @@ -467,7 +467,7 @@ territorio_comuni_on_key_release_event (GtkWidget *widget, return TRUE; } } - else if (event->keyval == GDK_F2) + else if (event->keyval == GDK_KEY_F2) { TerritorioComuniPrivate *priv = TERRITORIO_COMUNI_GET_PRIVATE ((TerritorioComuni *)user_data); diff --git a/src/importaviecivilia.c b/src/importaviecivilia.c index 4853bde..eaf5997 100644 --- a/src/importaviecivilia.c +++ b/src/importaviecivilia.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Andrea Zagli + * Copyright (C) 2011-2013 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -115,7 +115,6 @@ TerritorioImportaVieCivilia GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - gtk_dialog_set_has_separator (GTK_DIALOG (dialog), TRUE); carea = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); diff --git a/src/province.c b/src/province.c index ff03ec9..f5ae4f1 100644 --- a/src/province.c +++ b/src/province.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Andrea Zagli + * Copyright (C) 2010-2013 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include @@ -454,7 +454,7 @@ territorio_province_on_key_release_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_KEY_Escape) { TerritorioProvincePrivate *priv = TERRITORIO_PROVINCE_GET_PRIVATE ((TerritorioProvince *)user_data); @@ -464,7 +464,7 @@ territorio_province_on_key_release_event (GtkWidget *widget, return TRUE; } } - else if (event->keyval == GDK_F2) + else if (event->keyval == GDK_KEY_F2) { TerritorioProvincePrivate *priv = TERRITORIO_PROVINCE_GET_PRIVATE ((TerritorioProvince *)user_data); diff --git a/src/regioni.c b/src/regioni.c index f3dcf1d..c6eaa22 100644 --- a/src/regioni.c +++ b/src/regioni.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Andrea Zagli + * Copyright (C) 2010-2013 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include @@ -357,7 +357,7 @@ territorio_regioni_on_key_release_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_KEY_Escape) { TerritorioRegioniPrivate *priv = TERRITORIO_REGIONI_GET_PRIVATE ((TerritorioRegioni *)user_data); diff --git a/src/stati.c b/src/stati.c index 93bd436..23dbc53 100644 --- a/src/stati.c +++ b/src/stati.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Andrea Zagli + * Copyright (C) 2010-2013 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include @@ -356,7 +356,7 @@ territorio_stati_on_key_release_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_KEY_Escape) { TerritorioStatiPrivate *priv = TERRITORIO_STATI_GET_PRIVATE ((TerritorioStati *)user_data); diff --git a/src/vie.c b/src/vie.c index e3263e7..bc7be91 100644 --- a/src/vie.c +++ b/src/vie.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Andrea Zagli + * Copyright (C) 2010-2013 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,7 +19,7 @@ #include -#include +#include #include #include @@ -488,7 +488,7 @@ territorio_vie_on_key_release_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - if (event->keyval == GDK_Escape) + if (event->keyval == GDK_KEY_Escape) { TerritorioViePrivate *priv = TERRITORIO_VIE_GET_PRIVATE ((TerritorioVie *)user_data); @@ -498,7 +498,7 @@ territorio_vie_on_key_release_event (GtkWidget *widget, return TRUE; } } - else if (event->keyval == GDK_F2) + else if (event->keyval == GDK_KEY_F2) { TerritorioViePrivate *priv = TERRITORIO_VIE_GET_PRIVATE ((TerritorioVie *)user_data); diff --git a/src/widget.c b/src/widget.c index cf00abc..40984e5 100644 --- a/src/widget.c +++ b/src/widget.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Andrea Zagli + * Copyright (C) 2011-2013 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -168,7 +168,7 @@ territorio_widget_class_init (TerritorioWidgetClass *klass) object_class->set_property = territorio_widget_set_property; object_class->get_property = territorio_widget_get_property; - widget_class->size_request = territorio_widget_size_request; + /*widget_class->size_request = territorio_widget_size_request;*/ widget_class->size_allocate = territorio_widget_size_allocate; g_object_class_install_property (object_class, PROP_SHOW_STATO, @@ -987,9 +987,9 @@ territorio_widget_size_request (GtkWidget *widget, requisition->width = 0; requisition->height = 0; - if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) + if (gtk_bin_get_child (bin) && gtk_widget_is_visible (GTK_WIDGET (gtk_bin_get_child (bin)))) { - gtk_widget_size_request (bin->child, &child_requisition); + /*gtk_widget_size_request (gtk_bin_get_child (bin), &child_requisition);*/ requisition->width += child_requisition.width; requisition->height += child_requisition.height; } @@ -1005,6 +1005,7 @@ territorio_widget_size_allocate (GtkWidget *widget, { TerritorioWidget *twidget; GtkBin *bin; + GtkAllocation w_allocation; GtkAllocation relative_allocation; GtkAllocation child_allocation; @@ -1021,16 +1022,17 @@ territorio_widget_size_allocate (GtkWidget *widget, border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); relative_allocation.x = border_width; relative_allocation.y = border_width; - relative_allocation.width = MAX (1, (gint)widget->allocation.width - relative_allocation.x * 2); - relative_allocation.height = MAX (1, (gint)widget->allocation.height - relative_allocation.y * 2); + gtk_widget_get_allocation (widget, &w_allocation); + relative_allocation.width = MAX (1, w_allocation.width - relative_allocation.x * 2); + relative_allocation.height = MAX (1, w_allocation.height - relative_allocation.y * 2); - if (bin->child && GTK_WIDGET_VISIBLE (bin->child)) + if (gtk_bin_get_child (bin) && gtk_widget_is_visible (GTK_WIDGET (gtk_bin_get_child (bin)))) { child_allocation.x = relative_allocation.x + allocation->x; child_allocation.y = relative_allocation.y + allocation->y; child_allocation.width = relative_allocation.width; child_allocation.height = relative_allocation.height; - gtk_widget_size_allocate (bin->child, &child_allocation); + gtk_widget_size_allocate (gtk_bin_get_child (bin), &child_allocation); } } -- 2.49.0