Changes to compile with gtk3 and libgda5.

diff --git a/configure.ac b/configure.ac
index 01ffcb8aa7a4df6789c3eaef6ac33d801ddb45c7..cddb7d3a70346546e2f80d6c6225b0268e4a5cb4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([libgtkform], [0.4.1], [azagli@libero.it])
+AC_INIT([libgtkform], [0.5.0], [azagli@libero.it])
 AC_CONFIG_SRCDIR([libgtkform/form.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -46,11 +46,8 @@ PKG_CHECK_EXISTS(gladeui-1.0 >= 3.2.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no])
 
 AM_CONDITIONAL(GLADEUI, test $GLADEUI_FOUND = yes)
 
-PKG_CHECK_MODULES(GTKFORM, [glib-2.0 >= 2.26
-                            gtk+-2.0 >= 2.12.0
-                            libxml-2.0 >= 2.0.0
-                            libgdaex >= 0.4.0
-                            libgda-4.0 >= 4.2.3])
+PKG_CHECK_MODULES(GTKFORM, [libxml-2.0 >= 2.0.0
+                            libgdaex >= 0.5.0])
 
 AC_SUBST(GTKFORM_CFLAGS)
 AC_SUBST(GTKFORM_LIBS)

diff --git a/libgtkform.pc.in b/libgtkform.pc.in
index 42b9efe1d414a9360e71d525eb4790ab5b36de08..0968c62effbb929f5719df3e9476eee7ffed9bb8 100644 (file)
--- a/libgtkform.pc.in
+++ b/libgtkform.pc.in
@@ -7,6 +7,6 @@ modulesdir=@libdir@/@PACKAGE@/modules
 Name: @PACKAGE_NAME@
 Description: Class to more easly manage Gtk+ forms binded to db (or not).
 Version: @PACKAGE_VERSION@
-Requires: gtk+-2.0, libxml-2.0, libgdaex
+Requires: libxml-2.0 >= 2.0, libgdaex >= 0.5.0
 Libs: -L${libdir} -lgtkform
 Cflags: -I${includedir}

diff --git a/libgtkformui.pc.in b/libgtkformui.pc.in
index 73fe473d1ad840face9c127fdb8217714a0850bf..a381a9e62abce3d484e140ff66db8823ac77139a 100644 (file)
--- a/libgtkformui.pc.in
+++ b/libgtkformui.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: @PACKAGE_NAME@ui
 Description: Class to more easly manage Gtk+ forms binded to db (or not) UI.
 Version: @PACKAGE_VERSION@
-Requires: gtk+-2.0, libgtkform
+Requires: libgtkform
 Libs: -L${libdir} -lgtkformui
 Cflags: -I${includedir}

diff --git a/libgtkformui/gtkformdecoder.c b/libgtkformui/gtkformdecoder.c
index 2620e8dfa021a5ff79ad438b031cf62c8c8f6ab0..a1f62498473628bfbf4b12a13aa2b59cce63c9ed 100644 (file)
--- a/libgtkformui/gtkformdecoder.c
+++ b/libgtkformui/gtkformdecoder.c
@@ -1,7 +1,7 @@
 /*
  * GtkFormDecoder widget for GTK+
  *
- * 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
@@ -138,7 +138,7 @@ gtk_form_decoder_class_init (GtkFormDecoderClass *klass)
        object_class->set_property = gtk_form_decoder_set_property;
        object_class->get_property = gtk_form_decoder_get_property;
 
-       widget_class->size_request = gtk_form_decoder_size_request;
+       /*widget_class->size_request = gtk_form_decoder_size_request;*/
        widget_class->size_allocate = gtk_form_decoder_size_allocate;
 
        g_object_class_install_property (object_class, PROP_GDAEX,
@@ -251,7 +251,7 @@ gtk_form_decoder_init (GtkFormDecoder *decoder)
 
        GtkWidget *icon;
 
-       priv->hbox = gtk_hbox_new (FALSE, 1);
+       priv->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
        gtk_container_add (GTK_CONTAINER (decoder), priv->hbox);
        gtk_widget_show (priv->hbox);
 
@@ -788,9 +788,9 @@ gtk_form_decoder_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_get_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;
                }
@@ -806,6 +806,7 @@ gtk_form_decoder_size_allocate (GtkWidget *widget,
 {
        GtkFormDecoder *decoder;
        GtkBin *bin;
+       GtkAllocation w_allocation;
        GtkAllocation relative_allocation;
        GtkAllocation child_allocation;
 
@@ -822,16 +823,17 @@ gtk_form_decoder_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_get_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);
                }
 }
 

diff --git a/libgtkformui/test/query_editor.c b/libgtkformui/test/query_editor.c
index d160d098bc8013b14a308235f90460ec51e3b9ab..23fea6ecd8abbed87ca0dd251bba50ccc13c55b5 100644 (file)
--- a/libgtkformui/test/query_editor.c
+++ b/libgtkformui/test/query_editor.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
@@ -413,15 +413,15 @@ main (int argc, char *argv[])
        g_signal_connect (G_OBJECT (w), "delete-event",
                          gtk_main_quit, NULL);
 
-       vbox = gtk_vbox_new (FALSE, 5);
+       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
        gtk_container_add (GTK_CONTAINER (w), vbox);
 
        widget_qe = gdaex_query_editor_get_widget (qe);
        gtk_box_pack_start (GTK_BOX (vbox), widget_qe, TRUE, TRUE, 5);
 
-       hbtnbox = gtk_hbutton_box_new ();
+       hbtnbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
        gtk_button_box_set_layout (GTK_BUTTON_BOX (hbtnbox), GTK_BUTTONBOX_END);
-       gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbtnbox), 5);
+       gtk_box_set_spacing (GTK_BOX (hbtnbox), 5);
        gtk_box_pack_start (GTK_BOX (vbox), hbtnbox, FALSE, FALSE, 5);
 
        btn_clean = gtk_button_new_from_stock ("gtk-clear");

diff --git a/test/database.db b/test/database.db
index 602456713569ef10155bfc06dab307e3a5a1ddf2..1f59497cecac716841cf83235fa9d5020ef7563e 100644 (file)
Binary files a/test/database.db and b/test/database.db differ