[gtksourceviewmm/devel] Some work in SourceCompletionContext.



commit 30c730a7ce208dc3f734bdb3c483ab64c71fede4
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Sun Jan 10 17:50:15 2010 +0100

    Some work in SourceCompletionContext.
    
    * gtksourceview/src/sourcecompletioncontext.ccg:
    * gtksourceview/src/sourcecompletioncontext.hg: Fixed a typo in
    get_iter() method and added some conversions.

 gtksourceview/src/sourcecompletioncontext.ccg |    2 +-
 gtksourceview/src/sourcecompletioncontext.hg  |   12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/gtksourceview/src/sourcecompletioncontext.ccg b/gtksourceview/src/sourcecompletioncontext.ccg
index 2336322..8655f4b 100644
--- a/gtksourceview/src/sourcecompletioncontext.ccg
+++ b/gtksourceview/src/sourcecompletioncontext.ccg
@@ -22,7 +22,7 @@
 namespace gtksourceview
 {
 
-SourceMark SourceCompletionContext::get_iter() const
+SourceIter SourceCompletionContext::get_iter() const
 {
   GtkTextIter iter;
   gtk_source_completion_context_get_iter(const_cast<GtkSourceCompletionContext*>(gobj()), &iter);
diff --git a/gtksourceview/src/sourcecompletioncontext.hg b/gtksourceview/src/sourcecompletioncontext.hg
index ee89921..379e12a 100644
--- a/gtksourceview/src/sourcecompletioncontext.hg
+++ b/gtksourceview/src/sourcecompletioncontext.hg
@@ -23,6 +23,7 @@
 #include <gtksourceviewmm/sourcecompletionprovider.h>
 #include <gtksourceviewmm/sourcecompletionproposal.h>
 #include <gtksourceviewmm/sourcecompletion.h>
+#include <gtksourceview/gtksourceview-typebuiltins.h>
 
 _DEFS(gtksourceviewmm,gtksourceview)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -31,22 +32,27 @@ _PINCLUDE(glibmm/private/object_p.h)
 namespace gtksourceview
 {
 
+class SourceCompletionProvider;
+
 _WRAP_ENUM(SourceCompletionActivation, GtkSourceCompletionActivation)
 
 class SourceCompletionContext : public Glib::Object
 {
   _CLASS_GOBJECT(SourceCompletionContext, GtkSourceCompletionContext, GTK_SOURCE_COMPLETION_CONTEXT, Glib::Object, GObject)
 public:
+#m4 _CONVERSION(`const Glib::RefPtr<SourceCompletionProvider>&',`struct _GtkSourceCompletionProvider*',`($3)->gobj()')
+#m4 _CONVERSION(`const Glib::ListHandle<Glib::RefPtr<SourceCompletionProposal> >&',`GList*',`($3).data()')
   _WRAP_METHOD(void add_proposals(const Glib::RefPtr<SourceCompletionProvider>& provider, const Glib::ListHandle<Glib::RefPtr<SourceCompletionProposal> >& proposals, bool finished), gtk_source_completion_context_add_proposals)
+
+#m4 _CONVERSION(`GtkSourceView*',`SourceView*',`Glib::wrap($3)')
   _WRAP_METHOD(SourceView* get_view(), gtk_source_completion_context_get_view)
   _WRAP_METHOD(const SourceView* get_view() const, gtk_source_completion_context_get_view, constversion)
   _IGNORE(gtk_source_completion_context_get_iter)
-  SourceMark get_iter() const;
+  SourceIter get_iter() const;
 
   _WRAP_PROPERTY("activation", SourceCompletionActivation)
   _WRAP_PROPERTY("completion", SourceCompletion*)
-// TODO: wait until #604777 is fixed
-//  _WRAP_PROPERTY("iter", SourceIter)
+  _WRAP_PROPERTY("iter", SourceIter)
   _WRAP_PROPERTY("view", SourceView*)
 
   _WRAP_SIGNAL(void cancelled(), "cancelled")



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