gnomemm r1769 - in libgdamm/trunk: . libgda/src

[murrayc svn gnome org]

Author: murrayc
Date: Tue Nov  4 23:43:49 2008
New Revision: 1769
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1769&view=rev

Log:
2008-11-05  Murray Cumming  <murrayc murrayc com>

* libgda/src/dataaccesswrapper.hg:
* libgda/src/datacomparator.hg:
* libgda/src/datamodelarray.hg:
* libgda/src/datamodelimport.hg:
* libgda/src/dataselect.hg: Derive from DataModel and 
use _IMPLEMENTS_INTERFACE() so that dynamic_cast<> works 
when using wrap() on one of these C types.

Modified:
   libgdamm/trunk/ChangeLog
   libgdamm/trunk/libgda/src/dataaccesswrapper.hg
   libgdamm/trunk/libgda/src/datacomparator.hg
   libgdamm/trunk/libgda/src/datamodelarray.hg
   libgdamm/trunk/libgda/src/datamodelimport.hg
   libgdamm/trunk/libgda/src/dataselect.hg

Modified: libgdamm/trunk/libgda/src/dataaccesswrapper.hg
==============================================================================
--- libgdamm/trunk/libgda/src/dataaccesswrapper.hg	(original)
+++ libgdamm/trunk/libgda/src/dataaccesswrapper.hg	Tue Nov  4 23:43:49 2008
@@ -37,11 +37,15 @@
  *
  * @ingroup Connection
  */
-class DataAccessWrapper : public Glib::Object
+class DataAccessWrapper
+ : public Glib::Object,
+   public DataModel
 {
   _CLASS_GOBJECT(DataAccessWrapper, GdaDataAccessWrapper, GDA_DATA_ACCESS_WRAPPER, Glib::Object, GObject)
+  _IMPLEMENTS_INTERFACE(DataModel)
 protected:
   _WRAP_CTOR(DataAccessWrapper(const Glib::RefPtr<DataModel>& model), gda_data_access_wrapper_new)
+
 public:
   _WRAP_CREATE(const Glib::RefPtr<DataModel>& model)
   

Modified: libgdamm/trunk/libgda/src/datacomparator.hg
==============================================================================
--- libgdamm/trunk/libgda/src/datacomparator.hg	(original)
+++ libgdamm/trunk/libgda/src/datacomparator.hg	Tue Nov  4 23:43:49 2008
@@ -37,11 +37,15 @@
  *
  * @ingroup DataHandlers
  */
-class DataComparator : public Glib::Object
+class DataComparator
+ : public Glib::Object,
+   public DataModel
 {
   _CLASS_GOBJECT(DataComparator, GdaDataComparator, GDA_DATA_COMPARATOR, Glib::Object, GObject)
+  _IMPLEMENTS_INTERFACE(DataModel)
 protected:
   _WRAP_CTOR(DataComparator (const Glib::RefPtr<DataModel>& old_model, const Glib::RefPtr<DataModel>& new_model), gda_data_comparator_new)
+
 public:
   _WRAP_CREATE(const Glib::RefPtr<DataModel>& old_model, const Glib::RefPtr<DataModel>& new_model)
 

Modified: libgdamm/trunk/libgda/src/datamodelarray.hg
==============================================================================
--- libgdamm/trunk/libgda/src/datamodelarray.hg	(original)
+++ libgdamm/trunk/libgda/src/datamodelarray.hg	Tue Nov  4 23:43:49 2008
@@ -20,6 +20,7 @@
  */
 
 #include <glibmm/object.h>
+#include <libgdamm/datamodel.h>
 #include <libgdamm/row.h>
 
 _DEFS(libgdamm,libgda)
@@ -36,9 +37,11 @@
  * @ingroup DataModels
  */
 class DataModelArray
- : public Glib::Object
+ : public Glib::Object,
+   public DataModel
 {
   _CLASS_GOBJECT(DataModelArray, GdaDataModelArray, GDA_DATA_MODEL_ARRAY, Glib::Object, GObject)
+  _IMPLEMENTS_INTERFACE(DataModel)
 protected:
   explicit DataModelArray(int cols);
 

Modified: libgdamm/trunk/libgda/src/datamodelimport.hg
==============================================================================
--- libgdamm/trunk/libgda/src/datamodelimport.hg	(original)
+++ libgdamm/trunk/libgda/src/datamodelimport.hg	Tue Nov  4 23:43:49 2008
@@ -20,6 +20,7 @@
  */
 
 #include <glibmm/object.h>
+#include <libgdamm/datamodel.h>
 #include <libgdamm/set.h>
 
 _DEFS(libgdamm,libgda)
@@ -53,9 +54,11 @@
  * @ingroup DataModels
  */
 class DataModelImport
- : public Glib::Object
+ : public Glib::Object,
+   public DataModel
 {
   _CLASS_GOBJECT(DataModelImport, GdaDataModelImport, GDA_DATA_MODEL_IMPORT, Glib::Object, GObject)
+  _IMPLEMENTS_INTERFACE(DataModel)
 protected:
   DataModelImport(const std::string& filename, bool random_access, const Glib::RefPtr<const Set>& options);
   _IGNORE(gda_data_model_import_new_file)

Modified: libgdamm/trunk/libgda/src/dataselect.hg
==============================================================================
--- libgdamm/trunk/libgda/src/dataselect.hg	(original)
+++ libgdamm/trunk/libgda/src/dataselect.hg	Tue Nov  4 23:43:49 2008
@@ -37,9 +37,12 @@
  *
  * @ingroup Connection
  */
-class DataSelect : public Glib::Object
+class DataSelect
+ : public Glib::Object,
+   public DataModel
 {
   _CLASS_GOBJECT(DataSelect, GdaDataSelect, GDA_DATA_SELECT, Glib::Object, GObject)
+  _IMPLEMENTS_INTERFACE(DataModel)
 public:
   _WRAP_METHOD (bool set_row_selection_condition_sql (const Glib::ustring& sql_where), gda_data_select_set_row_selection_condition_sql, errthrow)
   // This is internal only