X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktreeviewcolumn.h;h=47cea714364ca1769b3c82516b67451e7a5e0a37;hb=02e915273845b21af223e7e5e2425569afcf1b83;hp=ac2807ba5b3f921cdac6051af7713257d137f2c5;hpb=9f4f22faf1d92d2ee8bc50c58b763e20e3f1e752;p=~andy%2Fgtk
diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index ac2807ba5..47cea7143 100644
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -12,18 +12,16 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
+#ifndef __GTK_TREE_VIEW_COLUMN_H__
+#define __GTK_TREE_VIEW_COLUMN_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GTK_TREE_VIEW_COLUMN_H__
-#define __GTK_TREE_VIEW_COLUMN_H__
-
#include
#include
#include
@@ -63,7 +61,7 @@ typedef enum
/**
* GtkTreeCellDataFunc:
- * @tree_column: A #GtkTreeColumn
+ * @tree_column: A #GtkTreeViewColumn
* @cell: The #GtkCellRenderer that is being rendered by @tree_column
* @tree_model: The #GtkTreeModel being rendered
* @iter: A #GtkTreeIter of the current row rendered
@@ -105,6 +103,7 @@ struct _GtkTreeViewColumnClass
GType gtk_tree_view_column_get_type (void) G_GNUC_CONST;
GtkTreeViewColumn *gtk_tree_view_column_new (void);
+GtkTreeViewColumn *gtk_tree_view_column_new_with_area (GtkCellArea *area);
GtkTreeViewColumn *gtk_tree_view_column_new_with_attributes (const gchar *title,
GtkCellRenderer *cell,
...) G_GNUC_NULL_TERMINATED;
@@ -141,6 +140,8 @@ gboolean gtk_tree_view_column_get_resizable (GtkTreeViewCol
void gtk_tree_view_column_set_sizing (GtkTreeViewColumn *tree_column,
GtkTreeViewColumnSizing type);
GtkTreeViewColumnSizing gtk_tree_view_column_get_sizing (GtkTreeViewColumn *tree_column);
+GDK_AVAILABLE_IN_3_2
+gint gtk_tree_view_column_get_x_offset (GtkTreeViewColumn *tree_column);
gint gtk_tree_view_column_get_width (GtkTreeViewColumn *tree_column);
gint gtk_tree_view_column_get_fixed_width (GtkTreeViewColumn *tree_column);
void gtk_tree_view_column_set_fixed_width (GtkTreeViewColumn *tree_column,
@@ -159,7 +160,7 @@ void gtk_tree_view_column_clicked (GtkTreeViewCol
*/
void gtk_tree_view_column_set_title (GtkTreeViewColumn *tree_column,
const gchar *title);
-G_CONST_RETURN gchar *gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column);
+const gchar * gtk_tree_view_column_get_title (GtkTreeViewColumn *tree_column);
void gtk_tree_view_column_set_expand (GtkTreeViewColumn *tree_column,
gboolean expand);
gboolean gtk_tree_view_column_get_expand (GtkTreeViewColumn *tree_column);
@@ -210,7 +211,7 @@ void gtk_tree_view_column_focus_cell (GtkTreeViewCol
GtkCellRenderer *cell);
gboolean gtk_tree_view_column_cell_get_position (GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell_renderer,
- gint *start_pos,
+ gint *x_offset,
gint *width);
void gtk_tree_view_column_queue_resize (GtkTreeViewColumn *tree_column);
GtkWidget *gtk_tree_view_column_get_tree_view (GtkTreeViewColumn *tree_column);