[gtksourceviewmm] Fix the build with latest GTK+ 3.



commit 2a7f42d04a6abb275103c2df00e174599d758d20
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Sep 28 17:14:26 2010 +0200

    Fix the build with latest GTK+ 3.
    
    * gtksourceview/src/sourcecompletion.hg: This is now a GObject, not a
    GtkObject.
    * gtksourceview/src/sourcecompletioncontext.hg:
    * gtksourceview/src/sourceview.hg: Use SourceCompletion via RefPtr.
    * codegen/m4/convert_gtksourceview.m4: Change the conversion.

 codegen/m4/convert_gtksourceview.m4          |    4 ++--
 gtksourceview/src/sourcecompletion.hg        |    8 ++++----
 gtksourceview/src/sourcecompletioncontext.hg |    2 +-
 gtksourceview/src/sourceview.hg              |    4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/codegen/m4/convert_gtksourceview.m4 b/codegen/m4/convert_gtksourceview.m4
index 119dfd0..e120346 100644
--- a/codegen/m4/convert_gtksourceview.m4
+++ b/codegen/m4/convert_gtksourceview.m4
@@ -66,8 +66,8 @@ _CONVERSION(`const Glib::RefPtr<SourceBuffer>&',`GtkSourceBuffer*',__CONVERT_REF
 
 
 # GtkSourceCompletion -> gtksourceview::SourceCompletion
-_CONVERSION(`GtkSourceCompletion*',`SourceCompletion*',`Glib::wrap($3)')
-_CONVERSION(`GtkSourceCompletion*',`const SourceCompletion*',`Glib::wrap($3)')
+_CONVERSION(`GtkSourceCompletion*',`Glib::RefPtr<SourceCompletion>',`Glib::wrap($3)')
+_CONVERSION(`GtkSourceCompletion*',`Glib::RefPtr<const SourceCompletion>',`Glib::wrap($3)')
 
 
 # GtkSourceCompletionContext -> gtksourceview::SourceCompletionContext
diff --git a/gtksourceview/src/sourcecompletion.hg b/gtksourceview/src/sourcecompletion.hg
index efcec58..278bf65 100644
--- a/gtksourceview/src/sourcecompletion.hg
+++ b/gtksourceview/src/sourcecompletion.hg
@@ -17,14 +17,14 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtkmm/object.h>
+#include <glibmm/object.h>
 #include <gtksourceviewmm/sourcecompletioncontext.h>
 #include <gtksourceviewmm/sourcecompletionprovider.h>
 #include <gtksourceviewmm/sourceview.h>
 #include <gtksourceviewmm/sourcecompletioninfo.h>
 
 _DEFS(gtksourceviewmm,gtksourceview)
-_PINCLUDE(gtkmm/private/object_p.h)
+_PINCLUDE(glibmm/private/object_p.h)
 
 namespace gtksourceview
 {
@@ -38,9 +38,9 @@ _WRAP_GERROR(SourceCompletionError, GtkSourceCompletionError, GTK_SOURCE_COMPLET
  *
  * @newin{2,10}
  */
-class SourceCompletion : public Gtk::Object
+class SourceCompletion : public Glib::Object
 {
-  _CLASS_GTKOBJECT(SourceCompletion, GtkSourceCompletion, GTK_SOURCE_COMPLETION, Gtk::Object, GtkObject)
+  _CLASS_GOBJECT(SourceCompletion, GtkSourceCompletion, GTK_SOURCE_COMPLETION, Glib::Object, GObject)
 public:
 
   /** Add a new SourceCompletionProvider to the completion object.
diff --git a/gtksourceview/src/sourcecompletioncontext.hg b/gtksourceview/src/sourcecompletioncontext.hg
index b634eaa..f98a7bc 100644
--- a/gtksourceview/src/sourcecompletioncontext.hg
+++ b/gtksourceview/src/sourcecompletioncontext.hg
@@ -85,7 +85,7 @@ public:
   _WRAP_METHOD(SourceCompletionActivation get_activation() const, gtk_source_completion_context_get_activation)
 
   _WRAP_PROPERTY("activation", SourceCompletionActivation)
-  _WRAP_PROPERTY("completion", SourceCompletion*)
+  _WRAP_PROPERTY("completion", Glib::RefPtr<SourceCompletion>)
   _WRAP_PROPERTY("iter", SourceIter)
 
   /** Emitted when the current population of proposals has been cancelled.
diff --git a/gtksourceview/src/sourceview.hg b/gtksourceview/src/sourceview.hg
index e3ddc2a..2a88c37 100644
--- a/gtksourceview/src/sourceview.hg
+++ b/gtksourceview/src/sourceview.hg
@@ -462,7 +462,7 @@ public:
    *
    * @newin{2,10}
    */
-  _WRAP_METHOD(SourceCompletion* get_completion(), gtk_source_view_get_completion, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<SourceCompletion> get_completion(), gtk_source_view_get_completion, refreturn)
 
   /** Gets the SourceCompletion associated with this view.
    *
@@ -470,7 +470,7 @@ public:
    *
    * @newin{2,10}
    */
-  _WRAP_METHOD(const SourceCompletion* get_completion() const, gtk_source_view_get_completion, refreturn, constversion)
+  _WRAP_METHOD(Glib::RefPtr<const SourceCompletion> get_completion() const, gtk_source_view_get_completion, refreturn, constversion)
 
   /** Emitted when redo action is requested.
    */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]