[gtksourceviewmm] Fix the build with the latest gtksourceview.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceviewmm] Fix the build with the latest gtksourceview.
- Date: Wed, 12 Jan 2011 22:48:10 +0000 (UTC)
commit 08e573ec89cb968c713f878eebf8802d5143c05f
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Jan 12 23:46:02 2011 +0100
Fix the build with the latest gtksourceview.
* gtksourceview/src/gtksourceview_methods.defs:
* gtksourceview/src/gtksourceview_signals.defs: Regenerated.
* gtksourceview/src/sourcemarkcategory.[hg|ccg]: Renamed to
* gtksourceview/src/sourcemarkattributes.[hg|ccg] as it as renamed in
the C API.
* gtksourceview/src/filelist.am: Update for the rename.
* codegen/extradefs/generate_extra_defs_gtksourceview.cc: Update this
too. The signals.defs were generated after this change, of course.
.../extradefs/generate_extra_defs_gtksourceview.cc | 4 +-
gtksourceview/src/filelist.am | 2 +-
gtksourceview/src/gtksourceview_methods.defs | 116 +++++++++-----------
gtksourceview/src/gtksourceview_signals.defs | 34 ++-----
...cemarkcategory.ccg => sourcemarkattributes.ccg} | 8 +-
...urcemarkcategory.hg => sourcemarkattributes.hg} | 44 ++++----
6 files changed, 89 insertions(+), 119 deletions(-)
---
diff --git a/codegen/extradefs/generate_extra_defs_gtksourceview.cc b/codegen/extradefs/generate_extra_defs_gtksourceview.cc
index 878eb42..f0e72bf 100644
--- a/codegen/extradefs/generate_extra_defs_gtksourceview.cc
+++ b/codegen/extradefs/generate_extra_defs_gtksourceview.cc
@@ -34,7 +34,7 @@
#include <gtksourceview/gtksourcelanguage.h>
#include <gtksourceview/gtksourcelanguagemanager.h>
#include <gtksourceview/gtksourcemark.h>
-#include <gtksourceview/gtksourcemarkcategory.h>
+#include <gtksourceview/gtksourcemarkattributes.h>
#include <gtksourceview/gtksourceprintcompositor.h>
#include <gtksourceview/gtksourcestyle.h>
#include <gtksourceview/gtksourcestylescheme.h>
@@ -63,7 +63,7 @@ int main (int argc, char *argv[])
<< get_defs (GTK_TYPE_SOURCE_LANGUAGE)
<< get_defs (GTK_TYPE_SOURCE_LANGUAGE_MANAGER)
<< get_defs (GTK_TYPE_SOURCE_MARK)
- << get_defs (GTK_TYPE_SOURCE_MARK_CATEGORY)
+ << get_defs (GTK_TYPE_SOURCE_MARK_ATTRIBUTES)
<< get_defs (GTK_TYPE_SOURCE_PRINT_COMPOSITOR)
<< get_defs (GTK_TYPE_SOURCE_STYLE)
<< get_defs (GTK_TYPE_SOURCE_STYLE_SCHEME)
diff --git a/gtksourceview/src/filelist.am b/gtksourceview/src/filelist.am
index e2ec0bf..a91fc27 100644
--- a/gtksourceview/src/filelist.am
+++ b/gtksourceview/src/filelist.am
@@ -25,7 +25,7 @@ files_hg = \
sourcelanguage.hg \
sourcelanguagemanager.hg \
sourcemark.hg \
- sourcemarkcategory.hg \
+ sourcemarkattributes.hg \
sourceprintcompositor.hg \
sourcestyle.hg \
sourcestylescheme.hg \
diff --git a/gtksourceview/src/gtksourceview_methods.defs b/gtksourceview/src/gtksourceview_methods.defs
index 2e19a4f..932ddf6 100644
--- a/gtksourceview/src/gtksourceview_methods.defs
+++ b/gtksourceview/src/gtksourceview_methods.defs
@@ -103,11 +103,11 @@
(gtype-id "GTK_TYPE_SOURCE_MARK")
)
-(define-object SourceMarkCategory
+(define-object SourceMarkAttributes
(in-module "Gtk")
(parent "GObject")
- (c-name "GtkSourceMarkCategory")
- (gtype-id "GTK_TYPE_SOURCE_MARK_CATEGORY")
+ (c-name "GtkSourceMarkAttributes")
+ (gtype-id "GTK_TYPE_SOURCE_MARK_ATTRIBUTES")
)
(define-object SourcePrintCompositor
@@ -1411,31 +1411,22 @@
-;; From gtksourcemarkcategory.h
+;; From gtksourcemarkattributes.h
-(define-function gtk_source_mark_category_get_type
- (c-name "gtk_source_mark_category_get_type")
+(define-function gtk_source_mark_attributes_get_type
+ (c-name "gtk_source_mark_attributes_get_type")
(return-type "GType")
)
-(define-function gtk_source_mark_category_new
- (c-name "gtk_source_mark_category_new")
- (is-constructor-of "GtkSourceMarkCategory")
- (return-type "GtkSourceMarkCategory*")
- (parameters
- '("const-gchar*" "id")
- )
-)
-
-(define-method get_id
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_get_id")
- (return-type "const-gchar*")
+(define-function gtk_source_mark_attributes_new
+ (c-name "gtk_source_mark_attributes_new")
+ (is-constructor-of "GtkSourceMarkAttributes")
+ (return-type "GtkSourceMarkAttributes*")
)
(define-method set_background
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_set_background")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_set_background")
(return-type "none")
(parameters
'("const-GdkRGBA*" "background")
@@ -1443,32 +1434,17 @@
)
(define-method get_background
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_get_background")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_get_background")
(return-type "gboolean")
(parameters
'("GdkRGBA*" "background")
)
)
-(define-method set_priority
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_set_priority")
- (return-type "none")
- (parameters
- '("gint" "priority")
- )
-)
-
-(define-method get_priority
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_get_priority")
- (return-type "gint")
-)
-
(define-method set_stock_id
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_set_stock_id")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_set_stock_id")
(return-type "none")
(parameters
'("const-gchar*" "stock_id")
@@ -1476,14 +1452,14 @@
)
(define-method get_stock_id
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_get_stock_id")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_get_stock_id")
(return-type "const-gchar*")
)
(define-method set_icon_name
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_set_icon_name")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_set_icon_name")
(return-type "none")
(parameters
'("const-gchar*" "icon_name")
@@ -1491,14 +1467,14 @@
)
(define-method get_icon_name
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_get_icon_name")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_get_icon_name")
(return-type "const-gchar*")
)
(define-method set_gicon
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_set_gicon")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_set_gicon")
(return-type "none")
(parameters
'("GIcon*" "gicon")
@@ -1506,14 +1482,14 @@
)
(define-method get_gicon
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_get_gicon")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_get_gicon")
(return-type "GIcon*")
)
(define-method set_pixbuf
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_set_pixbuf")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_set_pixbuf")
(return-type "none")
(parameters
'("const-GdkPixbuf*" "pixbuf")
@@ -1521,14 +1497,14 @@
)
(define-method get_pixbuf
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_get_pixbuf")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_get_pixbuf")
(return-type "const-GdkPixbuf*")
)
(define-method render_icon
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_render_icon")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_render_icon")
(return-type "const-GdkPixbuf*")
(parameters
'("GtkWidget*" "widget")
@@ -1537,8 +1513,8 @@
)
(define-method get_tooltip_text
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_get_tooltip_text")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_get_tooltip_text")
(return-type "gchar*")
(parameters
'("GtkSourceMark*" "mark")
@@ -1546,8 +1522,8 @@
)
(define-method get_tooltip_markup
- (of-object "GtkSourceMarkCategory")
- (c-name "gtk_source_mark_category_get_tooltip_markup")
+ (of-object "GtkSourceMarkAttributes")
+ (c-name "gtk_source_mark_attributes_get_tooltip_markup")
(return-type "gchar*")
(parameters
'("GtkSourceMark*" "mark")
@@ -2222,7 +2198,7 @@
(c-name "gtk_source_view_set_highlight_current_line")
(return-type "none")
(parameters
- '("gboolean" "show")
+ '("gboolean" "hl")
)
)
@@ -2277,12 +2253,24 @@
(return-type "gboolean")
)
-(define-method get_mark_category
+(define-method set_mark_attributes
+ (of-object "GtkSourceView")
+ (c-name "gtk_source_view_set_mark_attributes")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "category")
+ '("GtkSourceMarkAttributes*" "attributes")
+ '("gint" "priority")
+ )
+)
+
+(define-method get_mark_attributes
(of-object "GtkSourceView")
- (c-name "gtk_source_view_get_mark_category")
- (return-type "GtkSourceMarkCategory*")
+ (c-name "gtk_source_view_get_mark_attributes")
+ (return-type "GtkSourceMarkAttributes*")
(parameters
'("const-gchar*" "category")
+ '("gint*" "priority")
)
)
diff --git a/gtksourceview/src/gtksourceview_signals.defs b/gtksourceview/src/gtksourceview_signals.defs
index fe33e2b..1f29be7 100644
--- a/gtksourceview/src/gtksourceview_signals.defs
+++ b/gtksourceview/src/gtksourceview_signals.defs
@@ -1534,10 +1534,10 @@
(construct-only #t)
)
-;; From GtkSourceMarkCategory
+;; From GtkSourceMarkAttributes
(define-signal query-tooltip-text
- (of-object "GtkSourceMarkCategory")
+ (of-object "GtkSourceMarkAttributes")
(return-type "const-gchar*")
(when "last")
(parameters
@@ -1546,7 +1546,7 @@
)
(define-signal query-tooltip-markup
- (of-object "GtkSourceMarkCategory")
+ (of-object "GtkSourceMarkAttributes")
(return-type "const-gchar*")
(when "last")
(parameters
@@ -1554,17 +1554,8 @@
)
)
-(define-property id
- (of-object "GtkSourceMarkCategory")
- (prop-type "GParamString")
- (docs "The id")
- (readable #t)
- (writable #t)
- (construct-only #t)
-)
-
(define-property background
- (of-object "GtkSourceMarkCategory")
+ (of-object "GtkSourceMarkAttributes")
(prop-type "GParamBoxed")
(docs "The background")
(readable #t)
@@ -1572,17 +1563,8 @@
(construct-only #f)
)
-(define-property priority
- (of-object "GtkSourceMarkCategory")
- (prop-type "GParamInt")
- (docs "The priority")
- (readable #t)
- (writable #t)
- (construct-only #f)
-)
-
(define-property stock-id
- (of-object "GtkSourceMarkCategory")
+ (of-object "GtkSourceMarkAttributes")
(prop-type "GParamString")
(docs "The stock id")
(readable #t)
@@ -1591,7 +1573,7 @@
)
(define-property pixbuf
- (of-object "GtkSourceMarkCategory")
+ (of-object "GtkSourceMarkAttributes")
(prop-type "GParamObject")
(docs "The pixbuf")
(readable #t)
@@ -1600,7 +1582,7 @@
)
(define-property icon-name
- (of-object "GtkSourceMarkCategory")
+ (of-object "GtkSourceMarkAttributes")
(prop-type "GParamString")
(docs "The icon name")
(readable #t)
@@ -1609,7 +1591,7 @@
)
(define-property gicon
- (of-object "GtkSourceMarkCategory")
+ (of-object "GtkSourceMarkAttributes")
(prop-type "GParamObject")
(docs "The GIcon")
(readable #t)
diff --git a/gtksourceview/src/sourcemarkcategory.ccg b/gtksourceview/src/sourcemarkattributes.ccg
similarity index 80%
rename from gtksourceview/src/sourcemarkcategory.ccg
rename to gtksourceview/src/sourcemarkattributes.ccg
index c60c270..97f201e 100644
--- a/gtksourceview/src/sourcemarkcategory.ccg
+++ b/gtksourceview/src/sourcemarkattributes.ccg
@@ -1,4 +1,4 @@
-/* sourcemarkcategory.cc
+/* sourcemarkattributes.cc
*
* Copyright (C) 2010 Krzesimir Nowak
*
@@ -17,7 +17,7 @@
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <gtksourceview/gtksourcemarkcategory.h>
+#include <gtksourceview/gtksourcemarkattributes.h>
#include <giomm/icon.h>
#include <gdkmm/pixbuf.h>
@@ -28,9 +28,9 @@
namespace Gsv
{
-bool SourceMarkCategory::is_background_set() const
+bool SourceMarkAttributes::is_background_set() const
{
- return gtk_source_mark_category_get_background(const_cast<SourceMarkCategory*>(this)->gobj(), 0);
+ return gtk_source_mark_attributes_get_background(const_cast<SourceMarkAttributes*>(this)->gobj(), 0);
}
} // namespace Gsv
diff --git a/gtksourceview/src/sourcemarkcategory.hg b/gtksourceview/src/sourcemarkattributes.hg
similarity index 73%
rename from gtksourceview/src/sourcemarkcategory.hg
rename to gtksourceview/src/sourcemarkattributes.hg
index 9044086..1a0687f 100644
--- a/gtksourceview/src/sourcemarkcategory.hg
+++ b/gtksourceview/src/sourcemarkattributes.hg
@@ -1,4 +1,4 @@
-/* sourcemarkcategory.h
+/* sourcemarkattributes.h
*
* Copyright (C) 2010 Krzesimir Nowak
*
@@ -18,7 +18,7 @@
*/
/// \file
-/// \brief SourceMarkCategory class
+/// \brief SourceMarkAttributes class
#include <glibmm/object.h>
#include <glibmm/refptr.h>
@@ -55,53 +55,53 @@ namespace Gsv
class SourceMark;
// TODO: write docs.
-class SourceMarkCategory : public Glib::Object
+class SourceMarkAttributes : public Glib::Object
{
- _CLASS_GOBJECT(SourceMarkCategory, GtkSourceMarkCategory, GTK_SOURCE_MARK_CATEGORY, Glib::Object, GObject)
+ _CLASS_GOBJECT(SourceMarkAttributes, GtkSourceMarkAttributes, GTK_SOURCE_MARK_ATTRIBUTES, Glib::Object, GObject)
protected:
- _WRAP_CTOR(SourceMarkCategory(const std::string& id), gtk_source_mark_category_new)
+ _WRAP_CTOR(SourceMarkAttributes(const std::string& id), gtk_source_mark_attributes_new)
public:
_WRAP_CREATE(const std::string& id)
- _WRAP_METHOD(std::string get_id() const, gtk_source_mark_category_get_id)
+ _WRAP_METHOD(std::string get_id() const, gtk_source_mark_attributes_get_id)
- _WRAP_METHOD(bool get_background(Gdk::RGBA& rgba) const, gtk_source_mark_category_get_background)
+ _WRAP_METHOD(bool get_background(Gdk::RGBA& rgba) const, gtk_source_mark_attributes_get_background)
bool is_background_set() const;
- _WRAP_METHOD(void set_background(const Gdk::RGBA& rgba), gtk_source_mark_category_set_background)
+ _WRAP_METHOD(void set_background(const Gdk::RGBA& rgba), gtk_source_mark_attributes_set_background)
- _WRAP_METHOD(int get_priority() const, gtk_source_mark_category_get_priority)
+ _WRAP_METHOD(int get_priority() const, gtk_source_mark_attributes_get_priority)
- _WRAP_METHOD(void set_priority(int priority), gtk_source_mark_category_set_priority)
+ _WRAP_METHOD(void set_priority(int priority), gtk_source_mark_attributes_set_priority)
- _WRAP_METHOD(std::string get_stock_id() const, gtk_source_mark_category_get_stock_id)
+ _WRAP_METHOD(std::string get_stock_id() const, gtk_source_mark_attributes_get_stock_id)
- _WRAP_METHOD(void set_stock_id(const std::string& stock_id), gtk_source_mark_category_set_stock_id)
+ _WRAP_METHOD(void set_stock_id(const std::string& stock_id), gtk_source_mark_attributes_set_stock_id)
- _WRAP_METHOD(void set_icon_name(const std::string& icon_name), gtk_source_mark_category_set_icon_name)
+ _WRAP_METHOD(void set_icon_name(const std::string& icon_name), gtk_source_mark_attributes_set_icon_name)
- _WRAP_METHOD(std::string get_icon_name() const, gtk_source_mark_category_get_icon_name)
+ _WRAP_METHOD(std::string get_icon_name() const, gtk_source_mark_attributes_get_icon_name)
#m4 _CONVERSION(`GIcon*', `Glib::RefPtr<Gio::Icon>', `Glib::wrap($3)')
- _WRAP_METHOD(Glib::RefPtr<Gio::Icon> get_icon(), gtk_source_mark_category_get_gicon, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<Gio::Icon> get_icon(), gtk_source_mark_attributes_get_gicon, refreturn)
- _WRAP_METHOD(Glib::RefPtr<const Gio::Icon> get_icon() const, gtk_source_mark_category_get_gicon, constversion)
+ _WRAP_METHOD(Glib::RefPtr<const Gio::Icon> get_icon() const, gtk_source_mark_attributes_get_gicon, constversion)
#m4 _CONVERSION(`const Glib::RefPtr<Gio::Icon>&', `GIcon*', `Glib::unwrap($3)')
- _WRAP_METHOD(void set_icon(const Glib::RefPtr<Gio::Icon>& icon), gtk_source_mark_category_set_gicon)
+ _WRAP_METHOD(void set_icon(const Glib::RefPtr<Gio::Icon>& icon), gtk_source_mark_attributes_set_gicon)
#m4 _CONVERSION(`const GdkPixbuf*', `Glib::RefPtr<const Gdk::Pixbuf>', `Glib::wrap(const_cast<GdkPixbuf*>($3))')
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_pixbuf() const, gtk_source_mark_category_get_pixbuf, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_pixbuf() const, gtk_source_mark_attributes_get_pixbuf, refreturn)
#m4 _CONVERSION(`const Glib::RefPtr<const Gdk::Pixbuf>&', `const GdkPixbuf*', `Glib::unwrap($3)')
- _WRAP_METHOD(void set_pixbuf(const Glib::RefPtr<const Gdk::Pixbuf>& pixbuf), gtk_source_mark_category_set_pixbuf)
+ _WRAP_METHOD(void set_pixbuf(const Glib::RefPtr<const Gdk::Pixbuf>& pixbuf), gtk_source_mark_attributes_set_pixbuf)
- _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> render_icon(Gtk::Widget* widget, int size) const, gtk_source_mark_category_render_icon, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> render_icon(Gtk::Widget* widget, int size) const, gtk_source_mark_attributes_render_icon, refreturn)
- _WRAP_METHOD(Glib::ustring get_tooltip_text(const Glib::RefPtr<SourceMark>& mark) const, gtk_source_mark_category_get_tooltip_text)
+ _WRAP_METHOD(Glib::ustring get_tooltip_text(const Glib::RefPtr<SourceMark>& mark) const, gtk_source_mark_attributes_get_tooltip_text)
- _WRAP_METHOD(Glib::ustring get_tooltip_markup(const Glib::RefPtr<SourceMark>& mark) const, gtk_source_mark_category_get_tooltip_markup)
+ _WRAP_METHOD(Glib::ustring get_tooltip_markup(const Glib::RefPtr<SourceMark>& mark) const, gtk_source_mark_attributes_get_tooltip_markup)
_WRAP_PROPERTY("id", std::string)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]