[gtkmm] ToolItem, ToolShell: Wrapped new C functions.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] ToolItem, ToolShell: Wrapped new C functions.
- Date: Tue, 16 Mar 2010 16:18:08 +0000 (UTC)
commit bc4b07c2e3d70d83fd5f44f6936100a6c8cfa7df
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Mar 16 17:09:37 2010 +0100
ToolItem, ToolShell: Wrapped new C functions.
* gtk/src/toolitem.hg: Added get_text_alignment(), get_text_orientation(),
get_text_size_group().
* gtk/src/toolshell.hg: Added get_text_orientation(), get_text_alignment(),
get_ellipsize_mode(), get_text_size_group()
* tools/m4/convert_gtk.m4: Added SizeGroup conversions.
ChangeLog | 10 ++++++++++
gtk/src/toolitem.hg | 6 ++++++
gtk/src/toolshell.hg | 9 +++++++--
tools/m4/convert_gtk.m4 | 2 ++
4 files changed, 25 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0a717c3..84f2c1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2010-03-16 Murray Cumming <murrayc murrayc com>
+ ToolItem, ToolShell: Wrapped new C functions.
+
+ * gtk/src/toolitem.hg: Added get_text_alignment(), get_text_orientation(),
+ get_text_size_group().
+ * gtk/src/toolshell.hg: Added get_text_orientation(), get_text_alignment(),
+ get_ellipsize_mode(), get_text_size_group()
+ * tools/m4/convert_gtk.m4: Added SizeGroup conversions.
+
+2010-03-16 Murray Cumming <murrayc murrayc com>
+
Fix the build with -DGSEAL_ENABLE.
* configure.ac: Add -DGSEAL_ENABLE to the fatal warnings.
diff --git a/gtk/src/toolitem.hg b/gtk/src/toolitem.hg
index ede226d..ba13036 100644
--- a/gtk/src/toolitem.hg
+++ b/gtk/src/toolitem.hg
@@ -25,6 +25,7 @@ _CONFIGINCLUDE(gtkmmconfig.h)
#include <gtkmm/bin.h>
#include <gtkmm/tooltips.h>
+#include <gtkmm/sizegroup.h>
_DEFS(gtkmm,gtk)
_PINCLUDE(gtkmm/private/bin_p.h)
@@ -68,6 +69,11 @@ public:
_WRAP_METHOD(ToolbarStyle get_toolbar_style() const, gtk_tool_item_get_toolbar_style)
_WRAP_METHOD(ReliefStyle get_relief_style() const, gtk_tool_item_get_relief_style)
+ _WRAP_METHOD(float get_text_alignment() const, gtk_tool_item_get_text_alignment)
+ _WRAP_METHOD(Orientation get_text_orientation() const, gtk_tool_item_get_text_orientation)
+ _WRAP_METHOD(Glib::RefPtr<SizeGroup> get_text_size_group(), gtk_tool_item_get_text_size_group, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const SizeGroup> get_text_size_group() const, gtk_tool_item_get_text_size_group, refreturn, constversion)
+
_WRAP_METHOD(Widget* retrieve_proxy_menu_item(), gtk_tool_item_retrieve_proxy_menu_item)
_WRAP_METHOD(const Widget* retrieve_proxy_menu_item() const, gtk_tool_item_retrieve_proxy_menu_item, constversion)
_WRAP_METHOD(Widget* get_proxy_menu_item(const Glib::ustring& menu_item_id), gtk_tool_item_get_proxy_menu_item)
diff --git a/gtk/src/toolshell.hg b/gtk/src/toolshell.hg
index 5589ae9..298f882 100644
--- a/gtk/src/toolshell.hg
+++ b/gtk/src/toolshell.hg
@@ -19,7 +19,7 @@
#include <glibmm/interface.h>
#include <gtkmm/enums.h>
-//#include <gtk/gtktoolshell.h>
+#include <gtkmm/sizegroup.h>
#include <gtk/gtk.h>
_DEFS(gtkmm,gtk)
@@ -44,7 +44,12 @@ public:
_WRAP_METHOD(ToolbarStyle get_style() const, gtk_tool_shell_get_style)
_WRAP_METHOD(ReliefStyle get_relief_style() const, gtk_tool_shell_get_relief_style)
_WRAP_METHOD(void rebuild_menu(), gtk_tool_shell_rebuild_menu)
+ _WRAP_METHOD(Orientation get_text_orientation() const, gtk_tool_shell_get_text_orientation)
+ _WRAP_METHOD(float get_text_alignment() const, gtk_tool_shell_get_text_alignment)
+ _WRAP_METHOD(Pango::EllipsizeMode get_ellipsize_mode() const, gtk_tool_shell_get_ellipsize_mode)
+ _WRAP_METHOD(Glib::RefPtr<SizeGroup> get_text_size_group(), gtk_tool_shell_get_text_size_group, refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const SizeGroup> get_text_size_group() const, gtk_tool_shell_get_text_size_group, refreturn, constversion)
protected:
@@ -53,7 +58,7 @@ protected:
_WRAP_VFUNC(ToolbarStyle get_style(), get_style)
_WRAP_VFUNC(ReliefStyle get_relief_style(), get_relief_style)
_WRAP_VFUNC(void rebuild_menu(), rebuild_menu)
-
+ //TODO: Add the other vfuncs when we can break ABI.
};
} // namespace Gtk
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index e8217c2..bc1da3b 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -411,6 +411,8 @@ _CONVERSION(`const Glib::RefPtr<TextBuffer::ChildAnchor>&',`GtkTextChildAnchor*'
_CONVERSION(`GtkTextChildAnchor*',`Glib::RefPtr<ChildAnchor>',`Glib::wrap($3)')
_CONVERSION(`GtkTextChildAnchor*',`Glib::RefPtr<TextChildAnchor>',`Glib::wrap($3)')
_CONVERSION(`GtkTextChildAnchor*',`Glib::RefPtr<const TextChildAnchor>',`Glib::wrap($3)')
+_CONVERSION(`GtkSizeGroup*',`Glib::RefPtr<SizeGroup>',`Glib::wrap($3)')
+_CONVERSION(`GtkSizeGroup*',`Glib::RefPtr<const SizeGroup>',`Glib::wrap($3)')
_CONVERSION(`GtkEntryBuffer*',`Glib::RefPtr<EntryBuffer>',`Glib::wrap($3)')
_CONVERSION(`GtkEntryBuffer*',`Glib::RefPtr<const EntryBuffer>',`Glib::wrap($3)')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]