Modifiche per la compilazione con gtk3 e libgda5.

diff --git a/configure.ac b/configure.ac
index b9255b56a4ff50c530b7b3e3b74cc00eb8f2f271..e2d101d4d9d9cd205697a06133efbbdf1189f0c7 100644 (file)
--- 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 90aed00ae5222c6fe84a3dc946c66898d80a9c57..e98cc2dd8fd0643e40d5c4b7b37981f9bf78497e 100644 (file)
--- 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 081cc4cdb61f67c23edd1716daa04ce463ad2b14..ad4a4a5feaa5f02d99919d63c66f1c269280889c 100644 (file)
--- a/src/comuni.c
+++ b/src/comuni.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2010-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
  *
  * 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 <gdk/gdkkeysyms.h>
+#include <gdk/gdk.h>
 
 #include <libautoz/autoz.h>
 
@@ -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 4853bde0bed383178384fc86e593bdd23909464f..eaf59970b71e55cb7f936927606972c99bf19db3 100644 (file)
--- a/src/importaviecivilia.c
+++ b/src/importaviecivilia.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2011-2012 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2013 Andrea Zagli <azagli@libero.it>
  *
  * 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 ff03ec9e83b595d812a1e677412e73ad178a5b77..f5ae4f160546dbc129f3f099064699b756c1ba7a 100644 (file)
--- a/src/province.c
+++ b/src/province.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2010-2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
  *
  * 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 <gdk/gdkkeysyms.h>
+#include <gdk/gdk.h>
 
 #include <libautoz/autoz.h>
 #include <libsolipa/libsolipa.h>
@@ -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 f3dcf1d06d64307c393d0ecf9b7105e804e0a797..c6eaa2229eb9c94d321f0956ed4d7cbab1ae6903 100644 (file)
--- a/src/regioni.c
+++ b/src/regioni.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2010-2012 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
  *
  * 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 <gdk/gdkkeysyms.h>
+#include <gdk/gdk.h>
 
 #include <libautoz/autoz.h>
 #include <libsolipa/libsolipa.h>
@@ -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 93bd436a2a9aede689e86381a98e24f977eda2a9..23dbc5359a4b176b9fa92d3226ad17ab46067dec 100644 (file)
--- a/src/stati.c
+++ b/src/stati.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2010-2012 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
  *
  * 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 <gdk/gdkkeysyms.h>
+#include <gdk/gdk.h>
 
 #include <libautoz/autoz.h>
 #include <libsolipa/libsolipa.h>
@@ -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 e3263e7f5c0975b7f68df68865231219bb444f31..bc7be9166a83f738efc4c27bb8ecf13332de0570 100644 (file)
--- a/src/vie.c
+++ b/src/vie.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2010-2012 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2010-2013 Andrea Zagli <azagli@libero.it>
  *
  * 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 <string.h>
 
-#include <gdk/gdkkeysyms.h>
+#include <gdk/gdk.h>
 
 #include <libautoz/autoz.h>
 #include <libsolipa/libsolipa.h>
@@ -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 cf00abc8678251a85dc94c2bd8b00a2e21d1c9b9..40984e5130fe8e7e4df1bee9642c75c3f6da11bf 100644 (file)
--- a/src/widget.c
+++ b/src/widget.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2013 Andrea Zagli <azagli@libero.it>
  *
  * 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);
                }
 }