GNOME.org
 

[gtksourceviewmm] Improve documentation.

commit 504fb07cb5043a6a9fed493134c7994a6003ebfa
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Sun Nov 14 01:48:51 2010 +0100

    Improve documentation.
    
    * MIGRATION: Contents of these files were moved...
    * gtksourceview/gtksourceviewmm.h: ...here, fixed and doxygenized.
    * gtksourceview/gtksourceviewmm/sourcemarkup.h:
    * gtksourceview/src/sourcebuffer.hg:
    * gtksourceview/src/sourcecompletion.hg:
    * gtksourceview/src/sourcecompletioninfo.hg:
    * gtksourceview/src/sourcecompletionprovider.hg:
    * gtksourceview/src/sourcecompletionwords.hg:
    * gtksourceview/src/sourcegutter.hg:
    * gtksourceview/src/sourceprintcompositor.hg:
    * gtksourceview/src/sourceview.hg: Fixed some warnings from doxygen.log
    and moved some conversion macros above documentation comments, so gmmproc
    won't put converted docs from gtksourceview_docs.xml file.

 MIGRATION                                     |   44 ---------------
 gtksourceview/gtksourceviewmm.h               |   74 +++++++++++++++++++++++++
 gtksourceview/gtksourceviewmm/sourcemarkup.h  |   10 +++
 gtksourceview/src/sourcebuffer.hg             |   10 ++-
 gtksourceview/src/sourcecompletion.hg         |    4 +-
 gtksourceview/src/sourcecompletioninfo.hg     |    4 +-
 gtksourceview/src/sourcecompletionprovider.hg |    4 +-
 gtksourceview/src/sourcecompletionwords.hg    |    4 +-
 gtksourceview/src/sourcegutter.hg             |   12 ++--
 gtksourceview/src/sourceprintcompositor.hg    |    6 +-
 gtksourceview/src/sourceview.hg               |   10 ++--
 11 files changed, 113 insertions(+), 69 deletions(-)
---
diff --git a/gtksourceview/gtksourceviewmm.h b/gtksourceview/gtksourceviewmm.h
index f1e689b..0e50a25 100644
--- a/gtksourceview/gtksourceviewmm.h
+++ b/gtksourceview/gtksourceviewmm.h
@@ -71,6 +71,80 @@
  * of this project.
  */
 
+/** @page migration Migration from 2.0 to 3.0
+ *
+ * This page lists some notable API/ABI breaks. Probably not all were listed,
+ * but this is provided in hope that with help of this page migrating from
+ * gtksourceviewmm-2.0 to 3.0 won't be a cause of headaches.
+ *
+ * <ul>
+ * <li>Stuff marked as deprecated was removed of course.</li>
+ * <li>"source-mark-updated" signal in Gsv::SourceBuffer now takes Gtk::TextMark
+ * instead of SourceMark.</li>
+ * <li>Vfuncs in Gsv::SourceCompletionProposal, Gsv::SourceCompletionProvider
+ * and Gsv::SourceUndoManager are now private. They shouldn't be called directly
+ * anyway - there are respective methods for this.</li>
+ * <li>Some methods now takes std::string instead of Glib::ustring. These are:
+ * <ul>
+ * <li>Gsv::SourceLanguageManager::get_search_path()</li>
+ * <li>Gsv::SourceLanguageManager::set_search_path()</li>
+ * <li>Gsv::SourceLanguageManager::get_language_ids()</li>
+ * <li>Gsv::SourceLanguageManager::get_language()</li>
+ * <li>Gsv::SourceLanguageManager::guess_language()</li>
+ * <li>Gsv::SourceStyleSchemeManager::set_search_path()</li>
+ * <li>Gsv::SourceStyleSchemeManager::get_search_path()</li>
+ * <li>Gsv::SourceStyleSchemeManager::append_search_path()</li>
+ * <li>Gsv::SourceStyleSchemeManager::prepend_search_path()</li>
+ * <li>Gsv::SourceStyleSchemeManager::get_scheme()</li>
+ * <li>Gsv::SourceStyleSchemeManager::get_scheme_ids()</li>
+ * </ul></li>
+ * <li>Gsv::SourceMark's constructor with category and name has parameter order
+ * the same as C gtk_source_mark_new(). Previously parameter order was reversed,
+ * because name parameter could be omitted - it has a default value of empty
+ * string, which was interpreted as creating anonymous Gsv::SourceMark. Now
+ * there is separate constructor for creating anonymous SourceMarks. If there
+ * was:
+ * @code
+ * Glib::RefPtr<Gsv::SourceMark> sm (Gsv::SourceMark::create ("category", "name"));
+ * @endcode
+ * Now should be:
+ * @code
+ * Glib::RefPtr<Gsv::SourceMark> sm (Gsv::SourceMark::create ("name", "category"));
+ * @endcode
+ * If there was:
+ * @code
+ * Glib::RefPtr<Gsv::SourceMark> sm (Gsv::SourceMark::create ("category"));
+ * @endcode
+ * Nothing needs to be changed. If there was:
+ * @code
+ * Glib::RefPtr<Gsv::SourceMark> sm (Gsv::SourceMark::create ("category", ""));
+ * @endcode
+ * Now should be:
+ * @code
+ * Glib::RefPtr<Gsv::SourceMark> sm (Gsv::SourceMark::create ("category"));
+ * @endcode
+ * </li>
+ * <li>If there is a code that somehow depended on Gsv::SourceStyleScheme being
+ * a Glib::Interface, then this code is wrong, because it should always be
+ * a Glib::Object.</li>
+ * <li>SourceIter is gone - all its features are now supported by Gtk::TextIter.
+ * </li>
+ * <li>Gsv::SourceCompletion is now a Glib::Object, not Gtk::Object. So it
+ * should be used as Glib::RefPtr<Gsv::SourceCompletion> instead of plain
+ * Gsv::SourceCompletion.</li>
+ * <li>Namespace @b gtksourceview was renamed to @b Gsv. If there is a lot
+ * of code using  @b gtksourceview namespace then a workaround would be creating
+ * a backward compatibility header and including it a place included by affected
+ * sources. A header could contain a lines like that:
+ * @code
+ * #ifndef GTKSOURCEVIEWMM_COMPAT_H
+ * #define GTKSOURCEVIEWMM_COMPAT_H
+ * namespace gtksourceview = Gsv;
+ * #endif // GTKSOURCEVIEWMM_COMPAT_H
+ * @endcode</li>
+ * </ul>
+ */
+
 #include <gtksourceviewmmconfig.h>
 #include <gtksourceviewmm/init.h>
 #include <gtksourceviewmm/sourcebuffer.h>
diff --git a/gtksourceview/gtksourceviewmm/sourcemarkup.h b/gtksourceview/gtksourceviewmm/sourcemarkup.h
index 13aeede..5391886 100644
--- a/gtksourceview/gtksourceviewmm/sourcemarkup.h
+++ b/gtksourceview/gtksourceviewmm/sourcemarkup.h
@@ -127,6 +127,11 @@ protected:
 
 /** See SourceMarkup::equal()
  *
+ * @param lhs First SourceMarkup to compare.
+ * @param rhs Second SourceMarkup to compare.
+ *
+ * @return Whether @a lhs is different from @a rhs.
+ *
  * @relates Gsv::SourceMarkup
  *
  * @newin{2,10}
@@ -136,6 +141,11 @@ inline bool operator==(const SourceMarkup& lhs, const SourceMarkup& rhs)
 
 /** See SourceMarkup::equal()
  *
+ * @param lhs First SourceMarkup to compare.
+ * @param rhs Second SourceMarkup to compare.
+ *
+ * @return Whether @a lhs is different from @a rhs.
+ *
  * @relates Gsv::SourceMarkup
  *
  * @newin{2,10}
diff --git a/gtksourceview/src/sourcebuffer.hg b/gtksourceview/src/sourcebuffer.hg
index a4e0138..8a792c1 100644
--- a/gtksourceview/src/sourcebuffer.hg
+++ b/gtksourceview/src/sourcebuffer.hg
@@ -88,6 +88,8 @@ public:
   /** Create a new source buffer.
    *
    * @param tag_table A Gtk::TextTagTable or empty Glib::RefPtr, to create new.
+   *
+   * @return A new SourceBuffer.
    */
   _WRAP_CREATE(const Glib::RefPtr<Gtk::TextTagTable>& tag_table)
 
@@ -185,6 +187,7 @@ public:
 
   _WRAP_METHOD(void end_not_undoable_action(), gtk_source_buffer_end_not_undoable_action)
 
+#m4 _CONVERSION(`Gtk::TextIter&',`GtkTextIter*',`($3).gobj()')
   /** Moves iter to the position of the previous SourceMark of the given
    *  category.
    *
@@ -193,7 +196,6 @@ public:
    *
    * @return @c true if iter was moved.
    */
-#m4 _CONVERSION(`Gtk::TextIter&',`GtkTextIter*',`($3).gobj()')
   _WRAP_METHOD(bool backward_iter_to_source_mark(Gtk::TextIter& iter, const Glib::ustring& category), gtk_source_buffer_backward_iter_to_source_mark)
 
   /** Moves iter to the position of the previous SourceMark of any category.
@@ -223,6 +225,7 @@ public:
    */
   bool forward_iter_to_source_mark(Gtk::TextIter& iter);
 
+#m4 _CONVERSION(`const Gtk::TextIter&',`const GtkTextIter*',`($3).gobj()')
   /** Forces buffer to analyze and highlight the given area synchronously.
    *
    * @note This is a potentially slow operation and should be used only when you
@@ -232,7 +235,6 @@ public:
    * @param start Start of the area to highlight.
    * @param end End of the area to highlight.
    */
-#m4 _CONVERSION(`const Gtk::TextIter&',`const GtkTextIter*',`($3).gobj()')
   _WRAP_METHOD(void ensure_highlight(const Gtk::TextIter& start, const Gtk::TextIter& end), gtk_source_buffer_ensure_highlight)
 
   /** Returns the SourceStyleScheme currently used in buffer.
@@ -452,6 +454,7 @@ public:
   _WRAP_PROPERTY("style-scheme", Glib::RefPtr<SourceStyleScheme>)
   _WRAP_PROPERTY("undo-manager", Glib::RefPtr<SourceUndoManager>)
 
+#m4 _CONVERSION(`GtkTextIter*',`Gtk::TextIter&',`Glib::wrap($3)')
   /** Emitted whenever the syntax highlighting information has been updated,
    *  so that views can request a redraw if the region changed is visible.
    *
@@ -461,9 +464,9 @@ public:
    * start An iterator at the start of the updated region.
    * end An iterator at the end of the updated region.
    */
-#m4 _CONVERSION(`GtkTextIter*',`Gtk::TextIter&',`Glib::wrap($3)')
   _WRAP_SIGNAL(void highlight_updated(Gtk::TextIter& start, Gtk::TextIter& end), "highlight-updated", no_default_handler)
 
+#m4 _CONVERSION(`GtkTextMark*',`const Glib::RefPtr<Gtk::TextMark>&',`Glib::wrap($3, true)')
   /** Emitted whenever a marker of sourcebuffer has changed and needs to be redisplayed by the view.
    *
    * A change in a marker's type or location can trigger this signal.
@@ -472,7 +475,6 @@ public:
    * @par Handler parameters:
    * where An iterator at the location where the change occurred.
    */
-#m4 _CONVERSION(`GtkTextMark*',`const Glib::RefPtr<Gtk::TextMark>&',`Glib::wrap($3, true)')
   _WRAP_SIGNAL(void source_mark_updated(const Glib::RefPtr<Gtk::TextMark>& where), "source-mark-updated", no_default_handler)
 #m4 _CONVERSION(`GtkTextMark*',`const Glib::RefPtr<Gtk::TextMark>&',`Glib::wrap($3)')
 
diff --git a/gtksourceview/src/sourcecompletion.hg b/gtksourceview/src/sourcecompletion.hg
index d181695..6e87441 100644
--- a/gtksourceview/src/sourcecompletion.hg
+++ b/gtksourceview/src/sourcecompletion.hg
@@ -133,6 +133,7 @@ public:
   _WRAP_METHOD(const SourceView* get_view() const, gtk_source_completion_get_view, constversion)
 
   // TODO: Does "The reference being returned is a 'floating' reference, so if you invoke gtk_source_completion_show with this context you don't need to unref it." something mean for us? krnowak
+#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   /** Create a new SourceCompletionContext for completion.
    *
    * The position at which the completion using the new context will consider
@@ -144,7 +145,6 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   _WRAP_METHOD(Glib::RefPtr<SourceCompletionContext> create_context(const Gtk::TextIter& position), gtk_source_completion_create_context)
 
   // TODO: better wording could be used here - it is too convoluted. krnowak
@@ -194,6 +194,7 @@ public:
    */
   _WRAP_SIGNAL(void hide(), "hide")
 
+#m4 _CONVERSION(`GtkSourceCompletionContext*', `const Glib::RefPtr<SourceCompletionContext>&', `Glib::wrap($3, true)')
   /** Emitted just before starting to populate the completion with providers.
    *
    * You can use this signal to add additional attributes in the context.
@@ -203,7 +204,6 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`GtkSourceCompletionContext*', `const Glib::RefPtr<SourceCompletionContext>&', `Glib::wrap($3, true)')
   _WRAP_SIGNAL(void populate_context(const Glib::RefPtr<SourceCompletionContext>& context), "populate-context")
 #m4 _CONVERSION(`GtkSourceCompletionContext*', `const Glib::RefPtr<SourceCompletionContext>&', `Glib::wrap($3)')
 
diff --git a/gtksourceview/src/sourcecompletioninfo.hg b/gtksourceview/src/sourcecompletioninfo.hg
index aa56f1b..4d5908f 100644
--- a/gtksourceview/src/sourcecompletioninfo.hg
+++ b/gtksourceview/src/sourcecompletioninfo.hg
@@ -48,6 +48,8 @@ public:
    */
   SourceCompletionInfo();
 
+#m4 _CONVERSION(`const Gtk::TextView&',`GtkTextView*',`const_cast<GtkTextView*>(($3).gobj())')
+#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   /** Moves the SourceCompletionInfo to @a iter. Moving will respect the
    * Gdk::Gravity setting of the info window and will ensure the line at @a iter
    * is not occluded by the window.
@@ -57,8 +59,6 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`const Gtk::TextView&',`GtkTextView*',`const_cast<GtkTextView*>(($3).gobj())')
-#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   _WRAP_METHOD(void move_to_iter(const Gtk::TextView& view, const Gtk::TextIter& iter), gtk_source_completion_info_move_to_iter)
 
   /** Moves the Gtk::SourceCompletionInfo to the cursor position. Moving will
diff --git a/gtksourceview/src/sourcecompletionprovider.hg b/gtksourceview/src/sourcecompletionprovider.hg
index d4ed25f..e79a5f6 100644
--- a/gtksourceview/src/sourcecompletionprovider.hg
+++ b/gtksourceview/src/sourcecompletionprovider.hg
@@ -130,6 +130,7 @@ public:
    */
   _WRAP_METHOD(void update_info(const Glib::RefPtr<const SourceCompletionProposal>& proposal, const SourceCompletionInfo& info), gtk_source_completion_provider_update_info)
 
+#m4 _CONVERSION(`Gtk::TextIter&',`GtkTextIter*',`($3).gobj()')
   /** Get the Gtk::TextIter at which the completion for @a proposal starts.
    *
    * When implemented, the completion can use this information to position the
@@ -144,9 +145,9 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`Gtk::TextIter&',`GtkTextIter*',`($3).gobj()')
   _WRAP_METHOD(bool get_start_iter(const Glib::RefPtr<const SourceCompletionContext>& context, const Glib::RefPtr<const SourceCompletionProposal>& proposal, Gtk::TextIter& iter), gtk_source_completion_provider_get_start_iter)
 
+#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   /** Activate @a proposal at @a iter.
    *
    * When this functions returns <tt>false</tt>, the default activation of
@@ -161,7 +162,6 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   _WRAP_METHOD(bool activate_proposal(const Glib::RefPtr<SourceCompletionProposal>& proposal, const Gtk::TextIter& iter), gtk_source_completion_provider_activate_proposal)
 
   /** Get with what kind of activation the provider should be activated.
diff --git a/gtksourceview/src/sourcecompletionwords.hg b/gtksourceview/src/sourcecompletionwords.hg
index 1f88396..123d1ec 100644
--- a/gtksourceview/src/sourcecompletionwords.hg
+++ b/gtksourceview/src/sourcecompletionwords.hg
@@ -45,18 +45,20 @@ public:
    * @param name Provider's name
    * @param icon Provider's icon
    *
+   * @return A new SourceCompletionWords.
+   *
    * @newin{2,10}
    */
   _WRAP_CREATE(const Glib::ustring& name, const Glib::RefPtr<Gdk::Pixbuf>& icon)
 
 // TODO: think about a good method name - register is a C/C++ keyword. krnowak
+#m4 _CONVERSION(`const Glib::RefPtr<Gtk::TextBuffer>&',`GtkTextBuffer*',`Glib::unwrap($3)')
   /** Registers this provider in given buffer.
    *
    * @param buffer A buffer which will use this provider.
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`const Glib::RefPtr<Gtk::TextBuffer>&',`GtkTextBuffer*',`Glib::unwrap($3)')
   _WRAP_METHOD(void register_provider(const Glib::RefPtr<Gtk::TextBuffer>& buffer), gtk_source_completion_words_register)
 
   /** Unregisters this provider from given buffer.
diff --git a/gtksourceview/src/sourcegutter.hg b/gtksourceview/src/sourcegutter.hg
index 09981c6..ef8ef06 100644
--- a/gtksourceview/src/sourcegutter.hg
+++ b/gtksourceview/src/sourcegutter.hg
@@ -87,6 +87,7 @@ public:
    */
   _WRAP_METHOD(Glib::RefPtr<const Gdk::Window> get_window() const, gtk_source_gutter_get_window, constversion, refreturn)
 
+#m4 _CONVERSION(`Gtk::CellRenderer*',`GtkCellRenderer*',`Glib::unwrap($3)')
   /** Inserts @a renderer into a gutter at @a position.
    *
    * @param renderer A Gtk::CellRenderer.
@@ -94,7 +95,6 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`Gtk::CellRenderer*',`GtkCellRenderer*',`Glib::unwrap($3)')
   _WRAP_METHOD(void insert(Gtk::CellRenderer* renderer, int position), gtk_source_gutter_insert)
 
   /** Reorders @a renderer in a gutter to new @a position.
@@ -185,6 +185,9 @@ public:
   _WRAP_PROPERTY("view", SourceView*)
   _WRAP_PROPERTY("window-type", Gtk::TextWindowType)
 
+#m4 _CONVERSION(`GtkCellRenderer*',`Gtk::CellRenderer*',`Glib::wrap($3)')
+#m4 _CONVERSION(`GtkTextIter*',`const Gtk::TextIter&',`Glib::wrap($3)')
+#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   /** Emitted when a cell has been activated (for instance when there was
    *  a button press on the cell).
    *
@@ -198,11 +201,10 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`GtkCellRenderer*',`Gtk::CellRenderer*',`Glib::wrap($3)')
-#m4 _CONVERSION(`GtkTextIter*',`const Gtk::TextIter&',`Glib::wrap($3)')
-#m4 _CONVERSION(`const Gtk::TextIter&',`GtkTextIter*',`const_cast<GtkTextIter*>(($3).gobj())')
   _WRAP_SIGNAL(void cell_activated(Gtk::CellRenderer* renderer, const Gtk::TextIter& iter, GdkEvent* event), "cell-activated")
 
+#m4 _CONVERSION(`GtkTooltip*', `const Glib::RefPtr<Gtk::Tooltip>&', `Glib::wrap($3, true)')
+#m4 _CONVERSION(`const Glib::RefPtr<Gtk::Tooltip>&',`GtkTooltip*',`const_cast<GtkTooltip*>(Glib::unwrap($3))')
   /** Emitted when a tooltip is requested for a specific cell.
    *
    * Signal handlers can return @c true to notify the tooltip has been handled.
@@ -216,8 +218,6 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`GtkTooltip*', `const Glib::RefPtr<Gtk::Tooltip>&', `Glib::wrap($3, true)')
-#m4 _CONVERSION(`const Glib::RefPtr<Gtk::Tooltip>&',`GtkTooltip*',`const_cast<GtkTooltip*>(Glib::unwrap($3))')
   _WRAP_SIGNAL(bool query_tooltip(Gtk::CellRenderer* renderer, const Gtk::TextIter& iter, const Glib::RefPtr<Gtk::Tooltip>& tooltip), "query-tooltip")
 #m4 _CONVERSION(`GtkTooltip*', `const Glib::RefPtr<Gtk::Tooltip>&', `Glib::wrap($3)')
 };
diff --git a/gtksourceview/src/sourceprintcompositor.hg b/gtksourceview/src/sourceprintcompositor.hg
index ec3d7a7..9e6160d 100644
--- a/gtksourceview/src/sourceprintcompositor.hg
+++ b/gtksourceview/src/sourceprintcompositor.hg
@@ -44,7 +44,7 @@ public:
    *
    * @param buffer the SourceBuffer to print.
    *
-   * @return a new print compositor object.
+   * @return A new print compositor object.
    *
    * @newin{2,10}
    */
@@ -63,7 +63,7 @@ public:
    *
    * @param view A SourceView to get configuration from.
    *
-   * Return value: a new print compositor object.
+   * @return A new print compositor object.
    *
    * @newin{2,10}
    */
@@ -505,6 +505,7 @@ public:
    */
   _WRAP_METHOD(int get_n_pages() const, gtk_source_print_compositor_get_n_pages)
 
+#m4 _CONVERSION(`const Glib::RefPtr<Gtk::PrintContext>&',`GtkPrintContext*',`Glib::unwrap($3)')
   /** Paginate the document associated with the @a compositor.
    *
    * In order to support non-blocking pagination, document is paginated in small
@@ -566,7 +567,6 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`const Glib::RefPtr<Gtk::PrintContext>&',`GtkPrintContext*',`Glib::unwrap($3)')
   _WRAP_METHOD(bool paginate(const Glib::RefPtr<Gtk::PrintContext>& context), gtk_source_print_compositor_paginate)
 
   /** Return value: a fraction from 0.0 to 1.0 inclusive
diff --git a/gtksourceview/src/sourceview.hg b/gtksourceview/src/sourceview.hg
index 33d2a58..384270d 100644
--- a/gtksourceview/src/sourceview.hg
+++ b/gtksourceview/src/sourceview.hg
@@ -316,6 +316,7 @@ public:
    */
   void unset_mark_category_icon(const Glib::ustring& category);
 
+#m4 _CONVERSION(`const Gdk::Color&',`const GdkColor*',`($3).gobj()')
   /** Sets given background @a color for mark @a category.
    *
    * @param category A mark category.
@@ -323,7 +324,6 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`const Gdk::Color&',`const GdkColor*',`($3).gobj()')
   _WRAP_METHOD(void set_mark_category_background(const Glib::ustring& category, const Gdk::Color& color), gtk_source_view_set_mark_category_background)
 
   /** Unsets background for mark @a category.
@@ -334,6 +334,7 @@ public:
    */
   void unset_mark_category_background(const Glib::ustring& category);
 
+#m4 _CONVERSION(`Gdk::Color&',`GdkColor*',`($3).gobj()')
   /** Gets the background color associated with given @a category.
    *
    * @param category A mark category.
@@ -344,7 +345,6 @@ public:
    *
    * @newin{2,10}
    */
-#m4 _CONVERSION(`Gdk::Color&',`GdkColor*',`($3).gobj()')
   _WRAP_METHOD(bool get_mark_category_background(const Glib::ustring& category, Gdk::Color& dest) const, gtk_source_view_get_mark_category_background)
 
   /** Set if and how the spaces should be visualized.
@@ -363,6 +363,7 @@ public:
    */
   _WRAP_METHOD(SourceDrawSpacesFlags get_draw_spaces() const, gtk_source_view_get_draw_spaces)
 
+#m4 _CONVERSION(`const Gtk::TextIter&',`const GtkTextIter*',`($3).gobj()')
   /** Determines the visual column at @a iter taking into consideration the indent
    *  width of @a view.
    *
@@ -372,7 +373,6 @@ public:
    *
    * @newin{3,0}
    */
-#m4 _CONVERSION(`const Gtk::TextIter&',`const GtkTextIter*',`($3).gobj()')
   _WRAP_METHOD(guint get_visual_column(const Gtk::TextIter& iter) const, gtk_source_view_get_visual_column)
 
   /** Slot holding a function.
@@ -492,6 +492,8 @@ public:
    */
   _WRAP_SIGNAL(void undo(), "undo")
 
+#m4 _CONVERSION(`GtkTextIter*',`Gtk::TextIter&',`Glib::wrap($3)')
+#m4 _CONVERSION(`Gtk::TextIter&',`GtkTextIter*',`($3).gobj()')
   /** Emitted when a line mark has been activated (for instance when there
    *  was a button press in the line marks gutter).
    *
@@ -501,8 +503,6 @@ public:
    * iter A Gtk::TextIter.
    * event The GdkEvent that activated the event.
    */
-#m4 _CONVERSION(`GtkTextIter*',`Gtk::TextIter&',`Glib::wrap($3)')
-#m4 _CONVERSION(`Gtk::TextIter&',`GtkTextIter*',`($3).gobj()')
   _WRAP_SIGNAL(void line_mark_activated(Gtk::TextIter& mark, GdkEvent* event), "line-mark-activated")
 
   /** Emitted when a the cursor was moved according to the smart home end setting.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]