GNOME.org
 

gnomemm r1737 - in libgdamm/trunk: . libgda/src tools/m4

Author: jhs
Date: Sat Oct 11 13:53:15 2008
New Revision: 1737
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1737&view=rev

Log:
2008-10-11  Johannes Schmid  <jschmid openismus com>

	* configure.in: Require libgda 3.99.6
	* libgda/src/column.ccg:
	* libgda/src/column.hg:
	Wrapped set/get_attribte()
	
	* libgda/src/connection.ccg:
	* libgda/src/connection.hg:
	Wrapped statement_to_sql() and get_meta_store_data()

	* libgda/src/datamodel.hg:
	Removed non-existing property
	* libgda/src/holder.ccg:
	* libgda/src/holder.hg:
	Wrapped set/get_attribte()

	* libgda/src/quarklist.ccg:
	* libgda/src/quarklist.hg:
	Wrapped foreach()
	
	* libgda/src/libgda_enums.defs:
	* libgda/src/libgda_methods.defs:
	* libgda/src/libgda_others.defs:
	* libgda/src/libgda_signals.defs:
	Regenerated for new API version

	* libgda/src/statement.hg:
	Removed gda_statement_deserialize() (no longer in libgda)

	* tools/m4/convert_libgdamm.m4:
	Added some new conversions

Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/configure.in
   libgdamm/trunk/libgda/src/column.ccg
   libgdamm/trunk/libgda/src/column.hg
   libgdamm/trunk/libgda/src/connection.ccg
   libgdamm/trunk/libgda/src/connection.hg
   libgdamm/trunk/libgda/src/datamodel.hg
   libgdamm/trunk/libgda/src/holder.ccg
   libgdamm/trunk/libgda/src/holder.hg
   libgdamm/trunk/libgda/src/libgda_enums.defs
   libgdamm/trunk/libgda/src/libgda_methods.defs
   libgdamm/trunk/libgda/src/libgda_others.defs
   libgdamm/trunk/libgda/src/libgda_signals.defs
   libgdamm/trunk/libgda/src/quarklist.ccg
   libgdamm/trunk/libgda/src/quarklist.hg
   libgdamm/trunk/libgda/src/set.hg
   libgdamm/trunk/libgda/src/statement.hg
   libgdamm/trunk/tools/m4/convert_libgdamm.m4

Modified: libgdamm/trunk/configure.in
==============================================================================
--- libgdamm/trunk/configure.in	(original)
+++ libgdamm/trunk/configure.in	Sat Oct 11 13:53:15 2008
@@ -112,7 +112,7 @@
 #########################################################################
 #  Dependancy checks
 #########################################################################
-LIBGDA_REQUIRED=3.99.5
+LIBGDA_REQUIRED=3.99.6
 PKG_CHECK_MODULES(LIBGDAMM, glibmm-2.4 >= 2.12.8 libgda-4.0 >= $LIBGDA_REQUIRED)
 AC_SUBST(LIBGDAMM_CFLAGS)
 AC_SUBST(LIBGDAMM_LIBS)

Modified: libgdamm/trunk/libgda/src/column.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/column.ccg	(original)
+++ libgdamm/trunk/libgda/src/column.ccg	Sat Oct 11 13:53:15 2008
@@ -28,6 +28,14 @@
 
 namespace Gda
 {
+
+Glib::ValueBase Column::get_attribute(Glib::ustring& attribute) const
+{
+  const GValue* value = gda_column_get_attribute(const_cast<GdaColumn*>(gobj()), attribute.c_str());
+  Glib::ValueBase retval;
+  retval.init(value);
+  return retval;
+}
   
 Glib::ValueBase Column::get_default_value() const
 {

Modified: libgdamm/trunk/libgda/src/column.hg
==============================================================================
--- libgdamm/trunk/libgda/src/column.hg	(original)
+++ libgdamm/trunk/libgda/src/column.hg	Sat Oct 11 13:53:15 2008
@@ -52,6 +52,10 @@
   _WRAP_METHOD(Glib::ustring get_description() const, gda_column_get_description)
   _WRAP_METHOD(void set_description(const Glib::ustring& description), gda_column_set_description)
 
+  _WRAP_METHOD(void set_attribute (const Glib::ustring& attribute, const Glib::ValueBase& value), gda_column_set_attribute);
+  _WRAP_METHOD_DOCS_ONLY(gda_column_get_attribute);
+  Glib::ValueBase get_attribute(Glib::ustring& attribute) const;
+    
   _WRAP_METHOD(Glib::ustring get_name() const, gda_column_get_name)
   _WRAP_METHOD(void set_name(const Glib::ustring& name), gda_column_set_name)
   _WRAP_METHOD(Glib::ustring get_dbms_type() const, gda_column_get_dbms_type)

Modified: libgdamm/trunk/libgda/src/connection.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/connection.ccg	(original)
+++ libgdamm/trunk/libgda/src/connection.ccg	Sat Oct 11 13:53:15 2008
@@ -128,6 +128,34 @@
   return retval;
 }
 
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+Glib::ustring Connection::statement_to_sql(const Glib::RefPtr<Statement>& statement, const Glib::RefPtr<Set>& params, StatementSqlFlag flags, std::list< Glib::RefPtr<Holder> >& params_used)
+#else
+Glib::ustring Connection::statement_to_sql(const Glib::RefPtr<Statement>& statement, const Glib::RefPtr<Set>& params, StatementSqlFlag flags, std::list< Glib::RefPtr<Holder> >& params_used, std::auto_ptr<Glib::Error>& error)
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+{
+  GError* gerror = 0;
+  GSList* params_usedc = NULL;
+  Glib::ustring retvalue = Glib::convert_return_gchar_ptr_to_ustring(gda_connection_statement_to_sql(gobj(), Glib::unwrap(statement), Glib::unwrap(params), ((GdaStatementSqlFlag)(flags)), &params_usedc, &(gerror)));
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+#else
+  if(gerror)
+    error = ::Glib::Error::throw_exception(gerror);
+#endif //GLIBMM_EXCEPTIONS_ENABLED
+
+  Glib::SListHandle< Glib::RefPtr<Holder> > params_usedcpp(params_usedc, Glib::OWNERSHIP_SHALLOW);
+  for (Glib::SListHandle< Glib::RefPtr<Holder> >::const_iterator i = params_usedcpp.begin();
+       i != params_usedcpp.end(); i++)
+  {
+    params_used.push_back(*i);
+  }
+  
+  return retvalue;
+
+}
+
 } //namespace Gda
 
 } //namespace Gnome

Modified: libgdamm/trunk/libgda/src/connection.hg
==============================================================================
--- libgdamm/trunk/libgda/src/connection.hg	(original)
+++ libgdamm/trunk/libgda/src/connection.hg	Sat Oct 11 13:53:15 2008
@@ -168,8 +168,9 @@
   
   _WRAP_METHOD(bool statement_prepare (const Glib::RefPtr<Statement>& stmt), gda_connection_statement_prepare, errthrow)
 
-  // TODO: The variable argument list must be wrapped...
-  //_WRAP_METHOD(Glib::RefPtr<DataModel> get_meta_store_data (...), gda_connection_get_meta_store_data)
+  _IGNORE(gda_connection_get_meta_store_data)
+  #m4 _CONVERSION(`const Glib::ListHandle< Glib::RefPtr<Holder> >&',`GList*',`$3.data()')
+	_WRAP_METHOD(Glib::RefPtr<DataModel> get_meta_store_data(ConnectionMetaType type, const Glib::ListHandle< Glib::RefPtr<Holder> >& filters), gda_connection_get_meta_store_data_v, errthrow)
   _WRAP_METHOD(Glib::RefPtr<MetaStore> get_meta_store(), gda_connection_get_meta_store);
 
   #m4 _CONVERSION(`GSList*',`Glib::SListHandle< Glib::RefPtr<Glib::Object> >',`$2((GSList*)$3, Glib::OWNERSHIP_SHALLOW)')
@@ -178,6 +179,13 @@
   _WRAP_METHOD(bool perform_operation (const Glib::RefPtr<ServerOperation>& op), gda_connection_perform_operation, errthrow)
 
   _WRAP_METHOD(Glib::RefPtr<ServerProvider> get_provider(), gda_connection_get_provider)
+   
+  _WRAP_METHOD_DOCS_ONLY(gda_connection_statement_to_sql)
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  Glib::ustring statement_to_sql(const Glib::RefPtr<Statement>& statement, const Glib::RefPtr<Set>& params, StatementSqlFlag flags, std::list< Glib::RefPtr<Holder> >& params_used);
+  #else
+  Glib::ustring statement_to_sql(const Glib::RefPtr<Statement>& statement, const Glib::RefPtr<Set>& params, StatementSqlFlag flags, std::list< Glib::RefPtr<Holder> >& params_used, std::auto_ptr<Glib::Error>& error);
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
     
 _CONVERSION(`GdaConnectionEvent*',`const Glib::RefPtr<ConnectionEvent>&',Glib::wrap($3, true))
   _WRAP_SIGNAL(void error(const Glib::RefPtr<ConnectionEvent>& error), "error")

Modified: libgdamm/trunk/libgda/src/datamodel.hg
==============================================================================
--- libgdamm/trunk/libgda/src/datamodel.hg	(original)
+++ libgdamm/trunk/libgda/src/datamodel.hg	Sat Oct 11 13:53:15 2008
@@ -216,7 +216,6 @@
   _WRAP_METHOD(void row_updated(int row), gda_data_model_row_updated)
   _WRAP_METHOD(void row_removed(int row), gda_data_model_row_removed)
   */
-  _WRAP_METHOD(void signal_emit_changed(), gda_data_model_signal_emit_changed)
 
   _WRAP_METHOD(void set_column_name (int col, const Glib::ustring& name), gda_data_model_set_column_name)
   _WRAP_METHOD(Glib::ustring get_column_name (int col), gda_data_model_get_column_name)      

Modified: libgdamm/trunk/libgda/src/holder.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/holder.ccg	(original)
+++ libgdamm/trunk/libgda/src/holder.ccg	Sat Oct 11 13:53:15 2008
@@ -67,6 +67,14 @@
   return retval;
 }
 
+Glib::ValueBase Holder::get_attribute(Glib::ustring& attribute) const
+{
+  const GValue* value = gda_holder_get_attribute(const_cast<GdaHolder*>(gobj()), attribute.c_str());
+  Glib::ValueBase retval;
+  retval.init(value);
+  return retval;
+}
+
 } /* namespace Gda */
 
 } /* namespace Gnome */

Modified: libgdamm/trunk/libgda/src/holder.hg
==============================================================================
--- libgdamm/trunk/libgda/src/holder.hg	(original)
+++ libgdamm/trunk/libgda/src/holder.hg	Sat Oct 11 13:53:15 2008
@@ -59,6 +59,12 @@
 #else
   Glib::ValueBase take_static_value (const Glib::ValueBase& value, bool& value_changed, std::auto_ptr<Glib::Error>& error);
 #endif
+  _WRAP_METHOD(void set_attribute (const Glib::ustring& attribute, const Glib::ValueBase& value), gda_holder_set_attribute);
+  _WRAP_METHOD_DOCS_ONLY(gda_holder_get_attribute);
+  Glib::ValueBase get_attribute(Glib::ustring& attribute) const;
+
+  
+  
   _WRAP_METHOD_DOCS_ONLY(gda_holder_get_default_value)
   Glib::ValueBase get_default_value();
   _WRAP_METHOD(void set_default_value(const Glib::ValueBase& value), gda_holder_set_default_value)
@@ -83,7 +89,6 @@
   _WRAP_PROPERTY("name", Glib::ustring)
   _WRAP_PROPERTY("not-null", bool)
   _WRAP_PROPERTY("simple-bind", Glib::RefPtr<Holder>)
-  _WRAP_PROPERTY("plugin", Glib::ustring)
   _WRAP_PROPERTY("source-column", int)
   _WRAP_PROPERTY("source-model", Glib::RefPtr<DataModel>)
 

Modified: libgdamm/trunk/libgda/src/libgda_enums.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_enums.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_enums.defs	Sat Oct 11 13:53:15 2008
@@ -1,3 +1,20 @@
+;; From /usr/include/libgda-4.0/libgda/gda-binreloc.h
+
+(define-enum-extended PrefixDir
+  (in-module "Gda")
+  (c-name "GdaPrefixDir")
+  (values
+    '("no-dir" "GDA_NO_DIR" "0")
+    '("bin-dir" "GDA_BIN_DIR" "1")
+    '("sbin-dir" "GDA_SBIN_DIR" "2")
+    '("data-dir" "GDA_DATA_DIR" "3")
+    '("locale-dir" "GDA_LOCALE_DIR" "4")
+    '("lib-dir" "GDA_LIB_DIR" "5")
+    '("libexec-dir" "GDA_LIBEXEC_DIR" "6")
+    '("etc-dir" "GDA_ETC_DIR" "7")
+  )
+)
+
 ;; From /usr/include/libgda-4.0/libgda/gda-config.h
 
 (define-enum-extended ConfigError
@@ -288,26 +305,6 @@
   )
 )
 
-(define-enum-extended GraphType
-  (in-module "Gda")
-  (c-name "GdaGraphType")
-  (values
-    '("db-relations" "GDA_GRAPH_DB_RELATIONS" "0")
-    '("query-joins" "GDA_GRAPH_QUERY_JOINS" "1")
-    '("modelling" "GDA_GRAPH_MODELLING" "2")
-  )
-)
-
-(define-flags-extended QueryFieldState
-  (in-module "Gda")
-  (c-name "GdaQueryFieldState")
-  (values
-    '("visible" "GDA_ENTITY_FIELD_VISIBLE" "1 << 0")
-    '("invisible" "GDA_ENTITY_FIELD_INVISIBLE" "1 << 1")
-    '("any" "GDA_ENTITY_FIELD_ANY" "0x1")
-  )
-)
-
 ;; From /usr/include/libgda-4.0/libgda/gda-holder.h
 
 (define-enum-extended HolderError

Modified: libgdamm/trunk/libgda/src/libgda_methods.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_methods.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_methods.defs	Sat Oct 11 13:53:15 2008
@@ -209,6 +209,22 @@
 
 ;; Enumerations and flags ...
 
+(define-enum PrefixDir
+  (in-module "Gda")
+  (c-name "GdaPrefixDir")
+  (gtype-id "GDA_TYPE_PREFIX_DIR")
+  (values
+    '("no-dir" "GDA_NO_DIR")
+    '("bin-dir" "GDA_BIN_DIR")
+    '("sbin-dir" "GDA_SBIN_DIR")
+    '("data-dir" "GDA_DATA_DIR")
+    '("locale-dir" "GDA_LOCALE_DIR")
+    '("lib-dir" "GDA_LIB_DIR")
+    '("libexec-dir" "GDA_LIBEXEC_DIR")
+    '("etc-dir" "GDA_ETC_DIR")
+  )
+)
+
 (define-enum ConfigError
   (in-module "Gda")
   (c-name "GdaConfigError")
@@ -763,6 +779,8 @@
   (return-type "GdaAttributesManager*")
   (parameters
     '("gboolean" "for_objects")
+    '("GdaAttributesManagerSignal" "signal_func")
+    '("gpointer" "signal_data")
   )
 )
 
@@ -899,6 +917,24 @@
 
 
 
+;; From gda-binreloc.h
+
+(define-function gda_gbr_init
+  (c-name "gda_gbr_init")
+  (return-type "none")
+)
+
+(define-function gda_gbr_get_file_path
+  (c-name "gda_gbr_get_file_path")
+  (return-type "gchar*")
+  (parameters
+    '("GdaPrefixDir" "where")
+  )
+  (varargs #t)
+)
+
+
+
 ;; From gda-blob-op.h
 
 (define-function gda_blob_op_get_type
@@ -2102,12 +2138,6 @@
 
 ;; From gda-data-model-extra.h
 
-(define-method signal_emit_changed
-  (of-object "GdaDataModel")
-  (c-name "gda_data_model_signal_emit_changed")
-  (return-type "none")
-)
-
 (define-method row_inserted
   (of-object "GdaDataModel")
   (c-name "gda_data_model_row_inserted")
@@ -4827,15 +4857,6 @@
   (return-type "gchar*")
 )
 
-(define-function gda_statement_deserialize
-  (c-name "gda_statement_deserialize")
-  (return-type "GdaStatement*")
-  (parameters
-    '("const-gchar*" "str")
-    '("GError**" "error")
-  )
-)
-
 (define-method get_parameters
   (of-object "GdaStatement")
   (c-name "gda_statement_get_parameters")

Modified: libgdamm/trunk/libgda/src/libgda_others.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_others.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_others.defs	Sat Oct 11 13:53:15 2008
@@ -1,71 +1 @@
-
-; This file is written by hand because we can't instantiate interfaces:
-
-(define-signal row_inserted
-  (of-object "GdaDataModel")
-  (return-type "void")
-  (parameters
-    '("gint" "row")
-  )
-  (when "last")
-)
-
-(define-signal row_updated
-  (of-object "GdaDataModel")
-  (return-type "void")
-  (parameters
-    '("gint" "row")
-  )
-  (when "last")
-)
-
-(define-signal row_removed
-  (of-object "GdaDataModel")
-  (return-type "void")
-  (parameters
-    '("gint" "row")
-  )
-  (when "last")
-)
-
-(define-signal activated
-  (of-object "GdaReferer")
-  (return-type "void")
-)
-
-(define-signal deactivated
-  (of-object "GdaReferer")
-  (return-type "void")
-)
-
-; These are written by hand because they are defines, which are not recognised by h2defs.py:
-
-(define-method get_dict_types
-  (of-object "GdaDict")
-  (c-name "gda_dict_get_dict_types")
-  (return-type "GSList*")
-  (parameters
-  )
-)
-
-(define-method get_dict_type_by_name
-  (of-object "GdaDict")
-  (c-name "gda_dict_get_dict_type_by_name")
-  (return-type "GdaDictType*")
-  (parameters
-    '("const-gchar*" "name")
-  )
-) 
-
-(define-method get_dict_type_by_xml_id
-  (of-object "GdaDict")
-  (c-name "gda_dict_get_dict_type_by_xml_id")
-  (return-type "GdaDictType*")
-  (parameters
-    '("const-gchar*" "xml_id")
-  )
-) 
-
-
-
-
+; Currently empty

Modified: libgdamm/trunk/libgda/src/libgda_signals.defs
==============================================================================
--- libgdamm/trunk/libgda/src/libgda_signals.defs	(original)
+++ libgdamm/trunk/libgda/src/libgda_signals.defs	Sat Oct 11 13:53:15 2008
@@ -77,7 +77,7 @@
   )
 )
 
-(define-property user-filename
+(define-property system-filename
   (of-object "GdaConfig")
   (prop-type "GParamString")
   (docs "")
@@ -86,7 +86,7 @@
   (construct-only #f)
 )
 
-(define-property system-filename
+(define-property user-filename
   (of-object "GdaConfig")
   (prop-type "GParamString")
   (docs "")
@@ -587,16 +587,6 @@
   (when "first")
 )
 
-(define-signal attribute-changed
-  (of-object "GdaHolder")
-  (return-type "void")
-  (when "first")
-  (parameters
-    '("const-gchar*" "p0")
-    '("gpointer" "p1")
-  )
-)
-
 (define-signal validate-change
   (of-object "GdaHolder")
   (return-type "gpointer")
@@ -867,14 +857,21 @@
   (when "last")
 )
 
+(define-signal holder-plugin-changed
+  (of-object "GdaSet")
+  (return-type "void")
+  (when "first")
+  (parameters
+    '("GdaHolder*" "p0")
+  )
+)
+
 (define-signal holder-attr-changed
   (of-object "GdaSet")
   (return-type "void")
   (when "first")
   (parameters
     '("GdaHolder*" "p0")
-    '("const-gchar*" "p1")
-    '("gpointer" "p2")
   )
 )
 

Modified: libgdamm/trunk/libgda/src/quarklist.ccg
==============================================================================
--- libgdamm/trunk/libgda/src/quarklist.ccg	(original)
+++ libgdamm/trunk/libgda/src/quarklist.ccg	Sat Oct 11 13:53:15 2008
@@ -21,11 +21,40 @@
  
 #include <libgda/gda-quark-list.h>
 
+namespace
+{
+static void quarklist_foreach_callback(gpointer ckey, gpointer cvalue, void* data)
+{
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  try
+  {
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+    Gnome::Gda::QuarkList::ForeachSlot& slot = *static_cast<Gnome::Gda::QuarkList::ForeachSlot*>(data);
+    Glib::ustring key(static_cast<gchar*>(ckey));
+    Glib::ustring value(static_cast<gchar*>(cvalue));
+
+    slot(key, value);
+  #ifdef GLIBMM_EXCEPTIONS_ENABLED
+  }
+  catch(...)
+  {
+    Glib::exception_handlers_invoke();
+  }
+  #endif //GLIBMM_EXCEPTIONS_ENABLED
+} 
+}
+
 namespace Gnome
 {
 
 namespace Gda
+{  
+
+void QuarkList::foreach(const QuarkList::ForeachSlot& slot)
 {
+  ForeachSlot slot_copy (slot);
+  gda_quark_list_foreach(gobj(), &quarklist_foreach_callback, &slot_copy);
+}
 
 } // namespace Gda
 

Modified: libgdamm/trunk/libgda/src/quarklist.hg
==============================================================================
--- libgdamm/trunk/libgda/src/quarklist.hg	(original)
+++ libgdamm/trunk/libgda/src/quarklist.hg	Sat Oct 11 13:53:15 2008
@@ -36,13 +36,19 @@
   _IGNORE(gda_blob_get_type, gda_quark_list_new, gda_quark_list_copy, gda_quark_list_free)
   
   public:
-    // FIXME: new from string
     
-   _WRAP_METHOD(void clear(), gda_quark_list_clear)
-   _WRAP_METHOD(void add_from_string (const Glib::ustring& name, bool cleanup), gda_quark_list_add_from_string)
-   _WRAP_METHOD(Glib::ustring find(const Glib::ustring& name), gda_quark_list_find)
-   _WRAP_METHOD(void remove (const Glib::ustring& name), gda_quark_list_remove)
-   // TODO: foreach slot
+  _WRAP_METHOD(void clear(), gda_quark_list_clear)
+  _WRAP_METHOD(void add_from_string (const Glib::ustring& name, bool cleanup), gda_quark_list_add_from_string)
+  _WRAP_METHOD(Glib::ustring find(const Glib::ustring& name), gda_quark_list_find)
+  _WRAP_METHOD(void remove (const Glib::ustring& name), gda_quark_list_remove)
+   
+  /** For instance, 
+   * void on_foreach(Gtk::Widget* widget);
+   */
+  typedef sigc::slot<void, Glib::ustring, Glib::ustring> ForeachSlot;
+  _WRAP_METHOD_DOCS_ONLY(gda_quark_list_foreach)
+  void foreach(const ForeachSlot& slot);
+      
 };
 
 } // namespace Gda

Modified: libgdamm/trunk/libgda/src/set.hg
==============================================================================
--- libgdamm/trunk/libgda/src/set.hg	(original)
+++ libgdamm/trunk/libgda/src/set.hg	Sat Oct 11 13:53:15 2008
@@ -69,15 +69,14 @@
   _WRAP_METHOD(SetGroup* get_group (const Glib::RefPtr<Holder>& param), gda_set_get_group)
   _WRAP_METHOD(SetNode* get_node (const Glib::RefPtr<Holder>& param), gda_set_get_node)
 
-  // FIXME: _WRAP_SIGNAL(void holder_attr_changed (const Glib::RefPtr<Holder>& holder, const Glib::ustring& attr_name, const Glib::ValueBase& value), "holder-attr-changed")
   _WRAP_SIGNAL(void holder_changed (const Glib::RefPtr<Holder>& holder), "holder-changed")
   _WRAP_SIGNAL(void public_data_changed (), "public-data-changed")
   #m4 _CONVERSION(`gpointer',`Glib::Error*',`Glib::wrap($3)')
   #m4 _CONVERSION(`Glib::Error*',`gpointer',`(gpointer) $3->gobj()')
   _WRAP_SIGNAL(Glib::Error* validate_set(), "validate-set", no_default_handler)
-  // FIXME: Use C++ type for value  
-  //_WRAP_SIGNAL(Glib::Error* validate_holder_change(const Glib::RefPtr<Set> set, const Glib::RefPtr<Holder> holder, gpointer value), "validate-holder-change", no_default_handler)
-    
+//  _WRAP_SIGNAL(Glib::Error* validate_holder_change(const Glib::RefPtr<Holder>& holder,Glib::ValueBase value), "validate-holder-change", no_default_handler)
+//  _WRAP_SIGNAL(void holder_attr_changed (const Glib::RefPtr<Set>& set, const Glib::RefPtr<Holder>& holder, const Glib::ustring& attr_name, const Glib::ValueBase& value), "holder-attr-changed", no_default_handler)
+     
   _WRAP_PROPERTY("description", Glib::ustring)
   _WRAP_PROPERTY("id", Glib::ustring)
   _WRAP_PROPERTY("name", Glib::ustring)

Modified: libgdamm/trunk/libgda/src/statement.hg
==============================================================================
--- libgdamm/trunk/libgda/src/statement.hg	(original)
+++ libgdamm/trunk/libgda/src/statement.hg	Sat Oct 11 13:53:15 2008
@@ -53,7 +53,6 @@
   _WRAP_METHOD(Glib::RefPtr<Statement> copy(), gda_statement_copy)
   
   _WRAP_METHOD(Glib::ustring serialize(), gda_statement_serialize)
-  _WRAP_METHOD(static Glib::RefPtr<Statement> deserialize(const Glib::ustring& str), gda_statement_deserialize, errthrow)
   
   _WRAP_METHOD_DOCS_ONLY(gda_statement_get_parameters)
   #ifdef GLIBMM_EXCEPTIONS_ENABLED

Modified: libgdamm/trunk/tools/m4/convert_libgdamm.m4
==============================================================================
--- libgdamm/trunk/tools/m4/convert_libgdamm.m4	(original)
+++ libgdamm/trunk/tools/m4/convert_libgdamm.m4	Sat Oct 11 13:53:15 2008
@@ -115,6 +115,7 @@
 _CONV_ENUM(Gda,MetaDbObjectType)
 _CONV_ENUM(Gda,MetaSortType)
 _CONV_ENUM(Gda,MetaGraphInfo)
+_CONV_ENUM(Gda,StatementSqlFlag)
 
 # structs
 _CONVERSION(`Blob&',`GdaBlob*',__FR2P)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]