[Xfce4-commits] <exo:versioning-from-0.3-to-1> Remove exo_icon_view_{set, get}_{text, markup, pixbuf}_column() functions.
Jannis Pohlmann
jannis at xfce.org
Thu Aug 13 17:18:01 CEST 2009
Updating branch refs/heads/versioning-from-0.3-to-1
to 5ba0cb5e14b1e89f94c9e1a3fa9763dc57220249 (commit)
from 28e7f49b8864163aacf764b21d07592a14072a45 (commit)
commit 5ba0cb5e14b1e89f94c9e1a3fa9763dc57220249
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Thu Aug 13 17:16:47 2009 +0200
Remove exo_icon_view_{set,get}_{text,markup,pixbuf}_column() functions.
docs/reference/exo-sections.txt | 6 -
docs/reference/tmpl/exo-icon-view.sgml | 54 --------
exo/exo-icon-view.c | 212 --------------------------------
exo/exo-icon-view.h | 12 --
exo/exo.symbols | 6 -
python/exo.defs | 45 -------
6 files changed, 0 insertions(+), 335 deletions(-)
diff --git a/docs/reference/exo-sections.txt b/docs/reference/exo-sections.txt
index 71dc1fa..47cd6e2 100644
--- a/docs/reference/exo-sections.txt
+++ b/docs/reference/exo-sections.txt
@@ -164,12 +164,6 @@ exo_icon_view_new
exo_icon_view_new_with_model
exo_icon_view_get_model
exo_icon_view_set_model
-exo_icon_view_get_text_column
-exo_icon_view_set_text_column
-exo_icon_view_get_markup_column
-exo_icon_view_set_markup_column
-exo_icon_view_get_pixbuf_column
-exo_icon_view_set_pixbuf_column
exo_icon_view_get_orientation
exo_icon_view_set_orientation
exo_icon_view_get_columns
diff --git a/docs/reference/tmpl/exo-icon-view.sgml b/docs/reference/tmpl/exo-icon-view.sgml
index 7758ae1..9641544 100644
--- a/docs/reference/tmpl/exo-icon-view.sgml
+++ b/docs/reference/tmpl/exo-icon-view.sgml
@@ -261,60 +261,6 @@ A widget which displays a list of icons in a grid
@model:
-<!-- ##### FUNCTION exo_icon_view_get_text_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_icon_view_set_text_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at column:
-
-
-<!-- ##### FUNCTION exo_icon_view_get_markup_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_icon_view_set_markup_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at column:
-
-
-<!-- ##### FUNCTION exo_icon_view_get_pixbuf_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at Returns:
-
-
-<!-- ##### FUNCTION exo_icon_view_set_pixbuf_column ##### -->
-<para>
-
-</para>
-
- at icon_view:
- at column:
-
-
<!-- ##### FUNCTION exo_icon_view_get_orientation ##### -->
<para>
diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c
index 4837b4e..4ea75be 100644
--- a/exo/exo-icon-view.c
+++ b/exo/exo-icon-view.c
@@ -1343,10 +1343,6 @@ exo_icon_view_set_property (GObject *object,
exo_icon_view_set_margin (icon_view, g_value_get_int (value));
break;
- case PROP_MARKUP_COLUMN:
- exo_icon_view_set_markup_column (icon_view, g_value_get_int (value));
- break;
-
case PROP_MODEL:
exo_icon_view_set_model (icon_view, g_value_get_object (value));
break;
@@ -1355,10 +1351,6 @@ exo_icon_view_set_property (GObject *object,
exo_icon_view_set_orientation (icon_view, g_value_get_enum (value));
break;
- case PROP_PIXBUF_COLUMN:
- exo_icon_view_set_pixbuf_column (icon_view, g_value_get_int (value));
- break;
-
case PROP_REORDERABLE:
exo_icon_view_set_reorderable (icon_view, g_value_get_boolean (value));
break;
@@ -1387,10 +1379,6 @@ exo_icon_view_set_property (GObject *object,
exo_icon_view_set_spacing (icon_view, g_value_get_int (value));
break;
- case PROP_TEXT_COLUMN:
- exo_icon_view_set_text_column (icon_view, g_value_get_int (value));
- break;
-
case PROP_LAYOUT_MODE:
exo_icon_view_set_layout_mode (icon_view, g_value_get_enum (value));
break;
@@ -5468,206 +5456,6 @@ update_pixbuf_cell (ExoIconView *icon_view)
/**
- * exo_icon_view_get_text_column:
- * @icon_view: A #ExoIconView.
- *
- * Returns the column with text for @icon_view.
- *
- * Returns: the text column, or -1 if it's unset.
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- */
-gint
-exo_icon_view_get_text_column (const ExoIconView *icon_view)
-{
- g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), -1);
- return icon_view->priv->text_column;
-}
-
-
-
-/**
- * exo_icon_view_set_text_column:
- * @icon_view: A #ExoIconView.
- * @column: A column in the currently used model.
- *
- * Sets the column with text for @icon_view to be @column. The text
- * column must be of type #G_TYPE_STRING.
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- **/
-void
-exo_icon_view_set_text_column (ExoIconView *icon_view,
- gint column)
-{
- GType column_type;
-
- if (G_UNLIKELY (column == icon_view->priv->text_column))
- return;
-
- if (column == -1)
- {
- icon_view->priv->text_column = -1;
- }
- else
- {
- if (icon_view->priv->model != NULL)
- {
- column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
- g_return_if_fail (column_type == G_TYPE_STRING);
- }
-
- icon_view->priv->text_column = column;
- }
-
- exo_icon_view_stop_editing (icon_view, TRUE);
-
- update_text_cell (icon_view);
-
- exo_icon_view_invalidate_sizes (icon_view);
-
- g_object_notify (G_OBJECT (icon_view), "text-column");
-}
-
-
-
-/**
- * exo_icon_view_get_markup_column:
- * @icon_view: A #ExoIconView.
- *
- * Returns the column with markup text for @icon_view.
- *
- * Returns: the markup column, or -1 if it's unset.
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- */
-gint
-exo_icon_view_get_markup_column (const ExoIconView *icon_view)
-{
- g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), -1);
- return icon_view->priv->markup_column;
-}
-
-
-
-/**
- * exo_icon_view_set_markup_column:
- * @icon_view : A #ExoIconView.
- * @column : A column in the currently used model.
- *
- * Sets the column with markup information for @icon_view to be
- * @column. The markup column must be of type #G_TYPE_STRING.
- * If the markup column is set to something, it overrides
- * the text column set by exo_icon_view_set_text_column().
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- **/
-void
-exo_icon_view_set_markup_column (ExoIconView *icon_view,
- gint column)
-{
- if (G_UNLIKELY (column == icon_view->priv->markup_column))
- return;
-
- if (column == -1)
- icon_view->priv->markup_column = -1;
- else
- {
- if (icon_view->priv->model != NULL)
- {
- GType column_type;
-
- column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
-
- g_return_if_fail (column_type == G_TYPE_STRING);
- }
-
- icon_view->priv->markup_column = column;
- }
-
- exo_icon_view_stop_editing (icon_view, TRUE);
-
- update_text_cell (icon_view);
-
- exo_icon_view_invalidate_sizes (icon_view);
-
- g_object_notify (G_OBJECT (icon_view), "markup-column");
-}
-
-
-
-/**
- * exo_icon_view_get_pixbuf_column:
- * @icon_view : A #ExoIconView.
- *
- * Returns the column with pixbufs for @icon_view.
- *
- * Returns: the pixbuf column, or -1 if it's unset.
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- */
-gint
-exo_icon_view_get_pixbuf_column (const ExoIconView *icon_view)
-{
- g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), -1);
- return icon_view->priv->pixbuf_column;
-}
-
-
-
-/**
- * exo_icon_view_set_pixbuf_column:
- * @icon_view : A #ExoIconView.
- * @column : A column in the currently used model.
- *
- * Sets the column with pixbufs for @icon_view to be @column. The pixbuf
- * column must be of type #GDK_TYPE_PIXBUF
- *
- * Deprecated: Use the more powerful #GtkCellRenderer<!---->s instead, as #ExoIconView
- * now implements #GtkCellLayout.
- **/
-void
-exo_icon_view_set_pixbuf_column (ExoIconView *icon_view,
- gint column)
-{
- GType column_type;
-
- if (G_UNLIKELY (column == icon_view->priv->pixbuf_column))
- return;
-
- if (column == -1)
- {
- icon_view->priv->pixbuf_column = -1;
- }
- else
- {
- if (icon_view->priv->model != NULL)
- {
- column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
- g_return_if_fail (column_type == GDK_TYPE_PIXBUF);
- }
-
- icon_view->priv->pixbuf_column = column;
- }
-
- exo_icon_view_stop_editing (icon_view, TRUE);
-
- update_pixbuf_cell (icon_view);
-
- exo_icon_view_invalidate_sizes (icon_view);
-
- g_object_notify (G_OBJECT (icon_view), "pixbuf-column");
-
-}
-
-
-
-/**
* exo_icon_view_select_path:
* @icon_view : A #ExoIconView.
* @path : The #GtkTreePath to be selected.
diff --git a/exo/exo-icon-view.h b/exo/exo-icon-view.h
index fb30913..44affda 100644
--- a/exo/exo-icon-view.h
+++ b/exo/exo-icon-view.h
@@ -181,18 +181,6 @@ GtkTreeModel *exo_icon_view_get_model (const ExoIconView
void exo_icon_view_set_model (ExoIconView *icon_view,
GtkTreeModel *model);
-#ifndef EXO_DISABLE_DEPRECATED
-gint exo_icon_view_get_text_column (const ExoIconView *icon_view);
-void exo_icon_view_set_text_column (ExoIconView *icon_view,
- gint column);
-gint exo_icon_view_get_markup_column (const ExoIconView *icon_view);
-void exo_icon_view_set_markup_column (ExoIconView *icon_view,
- gint column);
-gint exo_icon_view_get_pixbuf_column (const ExoIconView *icon_view);
-void exo_icon_view_set_pixbuf_column (ExoIconView *icon_view,
- gint column);
-#endif
-
GtkOrientation exo_icon_view_get_orientation (const ExoIconView *icon_view);
void exo_icon_view_set_orientation (ExoIconView *icon_view,
GtkOrientation orientation);
diff --git a/exo/exo.symbols b/exo/exo.symbols
index f4ec851..38c9bef 100644
--- a/exo/exo.symbols
+++ b/exo/exo.symbols
@@ -162,12 +162,6 @@ exo_icon_view_new
exo_icon_view_new_with_model
exo_icon_view_get_model
exo_icon_view_set_model
-exo_icon_view_get_text_column
-exo_icon_view_set_text_column
-exo_icon_view_get_markup_column
-exo_icon_view_set_markup_column
-exo_icon_view_get_pixbuf_column
-exo_icon_view_set_pixbuf_column
exo_icon_view_get_orientation
exo_icon_view_set_orientation
exo_icon_view_get_columns
diff --git a/python/exo.defs b/python/exo.defs
index c326789..a4446d7 100644
--- a/python/exo.defs
+++ b/python/exo.defs
@@ -406,51 +406,6 @@
)
)
-(define-method get_text_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_get_text_column")
- (return-type "gint")
-)
-
-(define-method set_text_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_set_text_column")
- (return-type "none")
- (parameters
- '("gint" "column")
- )
-)
-
-(define-method get_markup_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_get_markup_column")
- (return-type "gint")
-)
-
-(define-method set_markup_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_set_markup_column")
- (return-type "none")
- (parameters
- '("gint" "column")
- )
-)
-
-(define-method get_pixbuf_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_get_pixbuf_column")
- (return-type "gint")
-)
-
-(define-method set_pixbuf_column
- (of-object "ExoIconView")
- (c-name "exo_icon_view_set_pixbuf_column")
- (return-type "none")
- (parameters
- '("gint" "column")
- )
-)
-
(define-method get_orientation
(of-object "ExoIconView")
(c-name "exo_icon_view_get_orientation")
More information about the Xfce4-commits
mailing list