[libgda-uimm] Fix the build with the latest (stable) libgda-ui.

[Murray Cumming <murrayc src gnome org>]

commit 93f8a7ea2c47e60d98f45fabd28a6e075368d1a0
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Oct 16 23:48:06 2010 +0200

    Fix the build with the latest (stable) libgda-ui.
    
    * libgda-ui/src/libgda_ui_methods.defs: Regenerated with h2defs.py
    * libgda-ui/src/libgda_ui_vfuncs.defs: Corrected by hand.
    * configure.ac: Depend on libgda-ui 4.2.0
    * libgda-ui/src/dataentry.[hg|ccg]: Removed get_default_value(). Added
    get/set_reference_value() and set_reference_current().

 ChangeLog                            |   10 ++++
 configure.ac                         |    2 +-
 libgda-ui/src/dataentry.ccg          |    4 +-
 libgda-ui/src/dataentry.hg           |   40 ++++++++++++-----
 libgda-ui/src/libgda_ui_methods.defs |   78 +++++++++++++++++++++++++--------
 libgda-ui/src/libgda_ui_vfuncs.defs  |    5 ++-
 6 files changed, 104 insertions(+), 35 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4e26cf9..5205717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-16  Murray Cumming  <murrayc murrayc com>
+
+	Fix the build with the latest (stable) libgda-ui.
+
+	* libgda-ui/src/libgda_ui_methods.defs: Regenerated with h2defs.py
+	* libgda-ui/src/libgda_ui_vfuncs.defs: Corrected by hand.
+	* configure.ac: Depend on libgda-ui 4.2.0
+	* libgda-ui/src/dataentry.[hg|ccg]: Removed get_default_value(). Added 
+	get/set_reference_value() and set_reference_current().
+
 3.99.20:
 
 2010-05-09  José Alburquerque  <jaalburqu svn gnome org>
diff --git a/configure.ac b/configure.ac
index 9420148..e19e2c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-AC_SUBST([LIBGDA_UIMM_MODULES], ['libgda-4.0 >= 4.1.5 libgda-ui-4.0 >= 4.1.5 libgdamm-4.0 >= 3.99.19 gtkmm-2.4 >= 2.18.0'])
+AC_SUBST([LIBGDA_UIMM_MODULES], ['libgda-4.0 >= 4.2.0 libgda-ui-4.0 >= 4.2.0 libgdamm-4.0 >= 3.99.19 gtkmm-2.4 >= 2.18.0'])
 PKG_CHECK_MODULES([LIBGDA_UIMM], [$LIBGDA_UIMM_MODULES])
 
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
diff --git a/libgda-ui/src/dataentry.ccg b/libgda-ui/src/dataentry.ccg
index 4101067..b483728 100644
--- a/libgda-ui/src/dataentry.ccg
+++ b/libgda-ui/src/dataentry.ccg
@@ -33,10 +33,10 @@ void DataEntry::get_value(Glib::ValueBase& value) const
   value.init(gvalue);
 }
 
-void DataEntry::get_original_value(Glib::ValueBase& value) const
+void DataEntry::get_reference_value(Glib::ValueBase& value) const
 {
   const GValue* gvalue =
-    gdaui_data_entry_get_original_value(const_cast<GdauiDataEntry*>(gobj()));
+    gdaui_data_entry_get_reference_value(const_cast<GdauiDataEntry*>(gobj()));
   value.init(gvalue);
 }
 
diff --git a/libgda-ui/src/dataentry.hg b/libgda-ui/src/dataentry.hg
index bc1d59f..6c48e4b 100644
--- a/libgda-ui/src/dataentry.hg
+++ b/libgda-ui/src/dataentry.hg
@@ -110,17 +110,32 @@ public:
 
   _WRAP_METHOD(bool content_is_valid(), gdaui_data_entry_content_is_valid, errthrow)
 
-  /** Fetch the original value held in the GdauiDataEntry widget.
+  _WRAP_METHOD(void set_reference_value(const Glib::ValueBase& value), gdaui_data_entry_set_reference_value)
+
+  //TODO: This (and others?) allow value=NULL.
+  /** Push a value into the DataEntry in the same way as set_value() but
+   * also sets this value as the reference value.
+   *
+   * @param value The value to set.
+   *
+   * @newin{4,2}
+   */
+  template <class DataType>
+  void set_reference_value(const DataType& value);
+  
+  /** Fetch the reference value held in the GdauiDataEntry widget.
    *
    * @param value A place in which to store the value.  The value must be
    * uninitialized and should not be modified.
    *
    * @newin{4,2}
    */
-  void get_original_value(Glib::ValueBase& value) const;
-  _IGNORE(gdaui_data_entry_get_original_value)
+  void get_reference_value(Glib::ValueBase& value) const;
+  _IGNORE(gdaui_data_entry_get_reference_value)
+  
+  _WRAP_METHOD(void set_reference_current(), gdaui_data_entry_set_reference_current)
 
-  /** Fetch the original value held in the GdauiDataEntry widget.
+  /** Fetch the reference value held in the GdauiDataEntry widget.
    *
    * @param value A place in which to store the value.  The value must be
    * uninitialized and should not be modified.
@@ -128,10 +143,11 @@ public:
    * @newin{4,2}
    */
   template<class DataType>
-  void get_original_value(DataType& value) const;
+  void get_reference_value(DataType& value) const;
 
   _WRAP_METHOD(void reset(), gdaui_data_entry_reset)
-  _WRAP_METHOD(void set_value_default(const Glib::ValueBase& value), gdaui_data_entry_set_value_default)
+
+  _WRAP_METHOD(void set_default_value(const Glib::ValueBase& value), gdaui_data_entry_set_default_value)
 
   /** Sets the default value for the DataEntry which gets displayed when the
    * user forces the default value. If it is not set then it is set to type
@@ -143,7 +159,7 @@ public:
    * @newin{4,2}
    */
   template <class DataType>
-  void set_value_default(const DataType& value);
+  void set_default_value(const DataType& value);
 
   _WRAP_METHOD(void set_attributes(Gnome::Gda::ValueAttribute attrs, Gnome::Gda::ValueAttribute mask), gdaui_data_entry_set_attributes)
   _WRAP_METHOD(Gnome::Gda::ValueAttribute get_attributes() const, gdaui_data_entry_get_attributes)
@@ -185,7 +201,7 @@ public:
 #m4 _CONVERSION(`GdaDataHandler', `Glib::RefPtr<Gnome::Gda::DataHandler>', `Glib::wrap($3, true)')
   _WRAP_VFUNC(Glib::RefPtr<Gnome::Gda::DataHandler> get_handler() const, "get_handler")
 
-  _WRAP_VFUNC(bool expand_in_layout() const, "expand-in-layout")
+  _WRAP_VFUNC(bool can_expand(bool horiz) const, "can-expand")
   _WRAP_VFUNC(void set_editable(bool editable), "set_editable")
   _WRAP_VFUNC(void grab_focus(), "grab-focus")
 
@@ -225,22 +241,22 @@ void DataEntry::get_value(DataType& value) const
 }
 
 template<class DataType>
-void DataEntry::get_original_value(DataType& value) const
+void DataEntry::get_reference_value(DataType& value) const
 {
   Glib::Value<DataType> temp;
-  this->get_original_value(temp);
+  this->get_reference_value(temp);
   value = temp.get();
 }
 
 template <class DataType>
-void DataEntry::set_value_default(const DataType& value)
+void DataEntry::set_default_value(const DataType& value)
 {
   typedef Glib::Value<DataType> ValueType;
 
   ValueType temp;
   temp.init(ValueType::value_type());
   temp.set(value);
-  this->set_value_default(temp);
+  this->set_default_value(temp);
 }
 
 #endif /* DOXYGEN_SHOULD_SKIP_THIS */
diff --git a/libgda-ui/src/libgda_ui_methods.defs b/libgda-ui/src/libgda_ui_methods.defs
index 3141f29..d980f5a 100644
--- a/libgda-ui/src/libgda_ui_methods.defs
+++ b/libgda-ui/src/libgda_ui_methods.defs
@@ -109,13 +109,6 @@
   (gtype-id "GDAUI_TYPE_SERVER_OPERATION")
 )
 
-(define-object Set
-  (in-module "Gdaui")
-  (parent "GObject")
-  (c-name "GdauiSet")
-  (gtype-id "GDAUI_TYPE_SET")
-)
-
 (define-object TreeStore
   (in-module "Gdaui")
   (parent "GObject")
@@ -125,6 +118,16 @@
 
 ;; Enumerations and flags ...
 
+(define-enum BasicFormPart
+  (in-module "Gdaui")
+  (c-name "GdauiBasicFormPart")
+  (gtype-id "GDAUI_TYPE_BASIC_FORM_PART")
+  (values
+    '("labels" "GDAUI_BASIC_FORM_LABELS")
+    '("entries" "GDAUI_BASIC_FORM_ENTRIES")
+  )
+)
+
 (define-enum DataProxyWriteMode
   (in-module "Gdaui")
   (c-name "GdauiDataProxyWriteMode")
@@ -329,6 +332,26 @@
   )
 )
 
+(define-method add_to_size_group
+  (of-object "GdauiBasicForm")
+  (c-name "gdaui_basic_form_add_to_size_group")
+  (return-type "none")
+  (parameters
+    '("GtkSizeGroup*" "size_group")
+    '("GdauiBasicFormPart" "part")
+  )
+)
+
+(define-method remove_from_size_group
+  (of-object "GdauiBasicForm")
+  (c-name "gdaui_basic_form_remove_from_size_group")
+  (return-type "none")
+  (parameters
+    '("GtkSizeGroup*" "size_group")
+    '("GdauiBasicFormPart" "part")
+  )
+)
+
 
 
 ;; From gdaui-cloud.h
@@ -436,6 +459,19 @@
 
 
 
+;; From gdaui-data-cell-renderer-util.h
+
+(define-function gdaui_data_cell_renderer_draw_invalid_area
+  (c-name "gdaui_data_cell_renderer_draw_invalid_area")
+  (return-type "none")
+  (parameters
+    '("GdkWindow*" "window")
+    '("GdkRectangle*" "cell_area")
+  )
+)
+
+
+
 ;; From gdaui-data-entry.h
 
 (define-function gdaui_data_entry_get_type
@@ -491,21 +527,21 @@
   )
 )
 
-(define-method get_original_value
+(define-method get_reference_value
   (of-object "GdauiDataEntry")
-  (c-name "gdaui_data_entry_get_original_value")
+  (c-name "gdaui_data_entry_get_reference_value")
   (return-type "const-GValue*")
 )
 
-(define-method reset
+(define-method set_reference_current
   (of-object "GdauiDataEntry")
-  (c-name "gdaui_data_entry_reset")
+  (c-name "gdaui_data_entry_set_reference_current")
   (return-type "none")
 )
 
-(define-method set_value_default
+(define-method set_default_value
   (of-object "GdauiDataEntry")
-  (c-name "gdaui_data_entry_set_value_default")
+  (c-name "gdaui_data_entry_set_default_value")
   (return-type "none")
   (parameters
     '("const-GValue*" "value")
@@ -534,10 +570,13 @@
   (return-type "GdaDataHandler*")
 )
 
-(define-method expand_in_layout
+(define-method can_expand
   (of-object "GdauiDataEntry")
-  (c-name "gdaui_data_entry_expand_in_layout")
+  (c-name "gdaui_data_entry_can_expand")
   (return-type "gboolean")
+  (parameters
+    '("gboolean" "horiz")
+  )
 )
 
 (define-method set_editable
@@ -833,6 +872,11 @@
 
 ;; From gdaui-enum-types.h
 
+(define-function gdaui_basic_form_part_get_type
+  (c-name "gdaui_basic_form_part_get_type")
+  (return-type "GType")
+)
+
 (define-function gdaui_data_proxy_write_mode_get_type
   (c-name "gdaui_data_proxy_write_mode_get_type")
   (return-type "GType")
@@ -1095,10 +1139,6 @@
 
 
 
-;; From gdaui-set.h
-
-
-
 ;; From gdaui-tree-store.h
 
 (define-function gdaui_tree_store_get_type
diff --git a/libgda-ui/src/libgda_ui_vfuncs.defs b/libgda-ui/src/libgda_ui_vfuncs.defs
index dd3e19f..c555867 100644
--- a/libgda-ui/src/libgda_ui_vfuncs.defs
+++ b/libgda-ui/src/libgda_ui_vfuncs.defs
@@ -70,9 +70,12 @@
   (return-type "GdaDataHandler*")
 )
 
-(define-vfunc expand_in_layout
+(define-vfunc can_expand
   (of-object "GdauiDataEntry")
   (return-type "gboolean")
+  (parameters
+   '("gboolean" "horiz")
+  )
 )
 
 (define-vfunc set_editable