[gtkmm] TreeViewColumn: Change TreeViewColumnSizing to TreeViewColumn::Sizing.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] TreeViewColumn: Change TreeViewColumnSizing to TreeViewColumn::Sizing.
- Date: Thu, 27 Apr 2017 19:54:04 +0000 (UTC)
commit dd6cd0c99c92ae69bdce5914628af58196424e55
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Apr 27 21:42:24 2017 +0200
TreeViewColumn: Change TreeViewColumnSizing to TreeViewColumn::Sizing.
demos/gtk-demo/example_treeview_liststore.cc | 2 +-
demos/gtk-demo/example_treeview_treestore.cc | 10 +++++-----
gtk/src/treeviewcolumn.ccg | 2 ++
gtk/src/treeviewcolumn.hg | 10 ++++++----
tools/m4/convert_gtk.m4 | 2 +-
5 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/demos/gtk-demo/example_treeview_liststore.cc b/demos/gtk-demo/example_treeview_liststore.cc
index 817a445..d236004 100644
--- a/demos/gtk-demo/example_treeview_liststore.cc
+++ b/demos/gtk-demo/example_treeview_liststore.cc
@@ -175,7 +175,7 @@ void Example_TreeView_ListStore::add_columns()
auto pColumn = m_TreeView.get_column(cols_count-1);
/* set this column to a fixed sizing (of 50 pixels) */
- pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumn::Sizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
diff --git a/demos/gtk-demo/example_treeview_treestore.cc b/demos/gtk-demo/example_treeview_treestore.cc
index f2dd404..ecb022d 100644
--- a/demos/gtk-demo/example_treeview_treestore.cc
+++ b/demos/gtk-demo/example_treeview_treestore.cc
@@ -341,7 +341,7 @@ void Example_TreeView_TreeStore::add_columns()
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
pColumn->add_attribute(pRenderer->property_activatable(), m_columns.world);
- pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumn::Sizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
@@ -358,7 +358,7 @@ void Example_TreeView_TreeStore::add_columns()
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
- pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumn::Sizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
@@ -376,7 +376,7 @@ void Example_TreeView_TreeStore::add_columns()
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
pColumn->add_attribute(pRenderer->property_activatable(), m_columns.world);
- pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumn::Sizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
@@ -393,7 +393,7 @@ void Example_TreeView_TreeStore::add_columns()
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
- pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumn::Sizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
@@ -410,7 +410,7 @@ void Example_TreeView_TreeStore::add_columns()
pColumn->add_attribute(pRenderer->property_visible(), m_columns.visible);
- pColumn->set_sizing(Gtk::TreeViewColumnSizing::FIXED);
+ pColumn->set_sizing(Gtk::TreeViewColumn::Sizing::FIXED);
pColumn->set_fixed_width(50);
pColumn->set_clickable();
}
diff --git a/gtk/src/treeviewcolumn.ccg b/gtk/src/treeviewcolumn.ccg
index d49b5ca..2ad9df1 100644
--- a/gtk/src/treeviewcolumn.ccg
+++ b/gtk/src/treeviewcolumn.ccg
@@ -18,6 +18,8 @@
#include <gtk/gtk.h>
#include <gtkmm/treeview_private.h>
+using Sizing = Gtk::TreeViewColumn::Sizing;
+
namespace Gtk
{
diff --git a/gtk/src/treeviewcolumn.hg b/gtk/src/treeviewcolumn.hg
index acfe5fe..d0f81e7 100644
--- a/gtk/src/treeviewcolumn.hg
+++ b/gtk/src/treeviewcolumn.hg
@@ -32,7 +32,6 @@ namespace Gtk
{
_CC_INCLUDE(gtk/gtk.h)
-_WRAP_ENUM(TreeViewColumnSizing, GtkTreeViewColumnSizing)
// We use GTKMM_API here because gcc needs the extra help on win32 , even
// when using --export-all and auto-import.
@@ -53,7 +52,10 @@ class GTKMM_API TreeViewColumn
_CLASS_GTKOBJECT(TreeViewColumn, GtkTreeViewColumn, GTK_TREE_VIEW_COLUMN, Object, GObject)
_IMPLEMENTS_INTERFACE(CellLayout)
_IGNORE(gtk_tree_view_column_set_cell_data_func)
+
public:
+_WRAP_ENUM(Sizing, GtkTreeViewColumnSizing)
+
typedef TreeViewColumn Column;
_CTOR_DEFAULT()
@@ -144,8 +146,8 @@ void set_renderer(Gtk::CellRenderer& renderer, const TreeModelColumnBase& column
_WRAP_METHOD(bool get_visible() const, gtk_tree_view_column_get_visible)
_WRAP_METHOD(void set_resizable(bool resizable = true), gtk_tree_view_column_set_resizable)
_WRAP_METHOD(bool get_resizable() const, gtk_tree_view_column_get_resizable)
- _WRAP_METHOD(void set_sizing(TreeViewColumnSizing type), gtk_tree_view_column_set_sizing)
- _WRAP_METHOD(TreeViewColumnSizing get_sizing(), gtk_tree_view_column_get_sizing)
+ _WRAP_METHOD(void set_sizing(Sizing type), gtk_tree_view_column_set_sizing)
+ _WRAP_METHOD(Sizing get_sizing(), gtk_tree_view_column_get_sizing)
_WRAP_METHOD(int get_x_offset() const, gtk_tree_view_column_get_x_offset)
_WRAP_METHOD(int get_width() const, gtk_tree_view_column_get_width)
_WRAP_METHOD(int get_fixed_width() const, gtk_tree_view_column_get_fixed_width)
@@ -210,7 +212,7 @@ void set_renderer(Gtk::CellRenderer& renderer, const TreeModelColumnBase& column
_WRAP_PROPERTY("x-offset", int)
_WRAP_PROPERTY("width", int)
_WRAP_PROPERTY("spacing", int)
- _WRAP_PROPERTY("sizing", TreeViewColumnSizing)
+ _WRAP_PROPERTY("sizing", Sizing)
_WRAP_PROPERTY("fixed-width", int)
_WRAP_PROPERTY("min-width", int)
_WRAP_PROPERTY("max-width", int)
diff --git a/tools/m4/convert_gtk.m4 b/tools/m4/convert_gtk.m4
index 9bacf23..67ca7c0 100644
--- a/tools/m4/convert_gtk.m4
+++ b/tools/m4/convert_gtk.m4
@@ -120,7 +120,7 @@ _CONV_ENUM(Gtk,ToolbarChildType)
_CONV_ENUM(Gtk,ToolbarStyle)
_CONV_ENUM(Gtk,ToolPaletteDragTargets)
_CONV_INCLASS_ENUM(Gtk,TreeModel,Flags)
-_CONV_ENUM(Gtk,TreeViewColumnSizing)
+_CONV_INCLASS_ENUM(Gtk,TreeViewColumn,Sizing)
_CONV_INCLASS_ENUM(Gtk,TreeView,DropPosition)
_CONV_INCLASS_ENUM(Gtk,TreeView,GridLines)
_CONV_ENUM(Gtk,UpdateType)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]