[libgda-uimm] Combo: Wrap methods.

[José Alburquerque <jaalburqu src gnome org>]

commit 884a7e61ea237520a0c7e4559dfed0749bc68fb2
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Fri Feb 19 17:44:00 2010 -0500

    	Combo: Wrap methods.
    
    	* libgda-ui/src/combo.hg: Wrap Combo methods.
    	* tools/m4/convert.m4: Include correct conversion files.
    	* tools/m4/convert_libgda_ui.m4: Remove unneeded file.
    	* tools/m4/convert_libgda_uimm.m4: Use this file for conversions.
    	* tools/m4/filelist.am: Correct m4 conversion file list.

 ChangeLog                       |   10 ++++++++++
 libgda-ui/src/combo.hg          |   11 ++++++++++-
 tools/m4/convert.m4             |    1 +
 tools/m4/convert_libgda_ui.m4   |    7 -------
 tools/m4/convert_libgda_uimm.m4 |   12 ++++++++----
 tools/m4/filelist.am            |    2 +-
 6 files changed, 30 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 993562f..fa65f0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-02-19  José Alburquerque  <jaalburqu svn gnome org>
 
+	Combo: Wrap methods.
+
+	* libgda-ui/src/combo.hg: Wrap Combo methods.
+	* tools/m4/convert.m4: Include correct conversion files.
+	* tools/m4/convert_libgda_ui.m4: Remove unneeded file.
+	* tools/m4/convert_libgda_uimm.m4: Use this file for conversions.
+	* tools/m4/filelist.am: Correct m4 conversion file list.
+
+2010-02-19  José Alburquerque  <jaalburqu svn gnome org>
+
 	Initial Generation of the docs and def files.
 
 	* libgda-ui/src/generate-docs.sh:
diff --git a/libgda-ui/src/combo.hg b/libgda-ui/src/combo.hg
index a0790d1..0b633e3 100644
--- a/libgda-ui/src/combo.hg
+++ b/libgda-ui/src/combo.hg
@@ -18,6 +18,7 @@
  */
 
 #include <gtkmm/combobox.h>
+#include <libgdamm/datamodel.h>
 
 _DEFS(libgda-uimm,libgda_ui)
 _PINCLUDE(gtkmm/private/combobox_p.h)
@@ -33,10 +34,18 @@ namespace GdaUI
 class Combo : public Gtk::ComboBox
 {
   _CLASS_GTKOBJECT(Combo, GdauiCombo, GDAUI_COMBO, Gtk::ComboBox, GtkComboBox)
+
+public:
+#m4 _CONVERSION(`const Glib::ArrayHandle<int>&', `gint*', `const_cast<gint*>($3.data())')
+  _WRAP_METHOD_DOCS_ONLY(gdaui_combo_new_with_model)
+  _WRAP_CTOR(Combo(Gnome::Gda::DataModel* model, int n_cols, const Glib::ArrayHandle<int>& cols_index), gdaui_combo_new_with_model)
+
 public:
+  _WRAP_METHOD(void set_model(Gnome::Gda::DataModel* model, int n_cols, const Glib::ArrayHandle<int>& cols_index), gdaui_combo_set_model)
+  _WRAP_METHOD(void add_null(bool add_null), gdaui_combo_add_null)
+  _WRAP_METHOD(bool is_null_selected(), gdaui_combo_is_null_selected)
 };
 
 } // namespace GdaUI
 
 } // namespace Gnome
-
diff --git a/tools/m4/convert.m4 b/tools/m4/convert.m4
index 12e8511..bf09256 100644
--- a/tools/m4/convert.m4
+++ b/tools/m4/convert.m4
@@ -4,3 +4,4 @@
 # Maybe choosing to include the same files as this one.
 
 include(convert_gtkmm.m4)
+include(convert_libgda_uimm.m4)
diff --git a/tools/m4/convert_libgda_uimm.m4 b/tools/m4/convert_libgda_uimm.m4
index 0c79b08..6d990d1 100644
--- a/tools/m4/convert_libgda_uimm.m4
+++ b/tools/m4/convert_libgda_uimm.m4
@@ -1,5 +1,9 @@
-## Copyright (c) 2009 The libgda-uimm Development Team
+dnl Copyright (c) 2009 The libgda-uimm Development Team
 
-include(convert_base.m4)
-include(convert_libgda_ui.m4)
-include(convert_glib.m4)
+dnl Enums:
+_CONV_ENUM(Gda,ExampleEnum)
+
+dnl DataModel:
+_CONVERSION(`Gnome::Gda::DataModel*', `GdaDataModel*', `Glib::unwrap($3)')
+
+dnl General conversions:
diff --git a/tools/m4/filelist.am b/tools/m4/filelist.am
index 836bc59..f902e66 100644
--- a/tools/m4/filelist.am
+++ b/tools/m4/filelist.am
@@ -1,3 +1,3 @@
 ## Copyright (c) 2009 The libgda-uimm Development Team
 
-files_codegen_m4 = convert.m4 convert_libgda_ui.m4
+files_codegen_m4 = convert.m4 convert_libgda_uimm.m4