Updated Bulgarian translation by Alexander Shopov <ash@contact.bg>

[~andy/gtk] / gtk / gtktreeviewcolumn.h

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 6f689226e4084237c82c5cb6b9534d49ee5c5054..a2edd2090aaad8363a029e10de11d3c61eea7c69 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -20,26 +20,28 @@
 #ifndef __GTK_TREE_VIEW_COLUMN_H__
 #define __GTK_TREE_VIEW_COLUMN_H__
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 #include <gtk/gtkcellrenderer.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtktreesortable.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+/* Not needed, retained for compatibility -Yosh */
+#include <gtk/gtkobject.h>
+
+
+G_BEGIN_DECLS
+
 
 #define GTK_TYPE_TREE_VIEW_COLUMN           (gtk_tree_view_column_get_type ())
-#define GTK_TREE_VIEW_COLUMN(obj)           (GTK_CHECK_CAST ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumn))
-#define GTK_TREE_VIEW_COLUMN_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
-#define GTK_IS_TREE_VIEW_COLUMN(obj)        (GTK_CHECK_TYPE ((obj), GTK_TYPE_TREE_VIEW_COLUMN))
-#define GTK_IS_TREE_VIEW_COLUMN_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GTK_TYPE_TREE_VIEW_COLUMN))
-#define GTK_TREE_VIEW_COLUMN_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
+#define GTK_TREE_VIEW_COLUMN(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumn))
+#define GTK_TREE_VIEW_COLUMN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
+#define GTK_IS_TREE_VIEW_COLUMN(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_VIEW_COLUMN))
+#define GTK_IS_TREE_VIEW_COLUMN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TREE_VIEW_COLUMN))
+#define GTK_TREE_VIEW_COLUMN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_TREE_VIEW_COLUMN, GtkTreeViewColumnClass))
 
 typedef enum
 {
   GTK_TREE_VIEW_COLUMN_GROW_ONLY,
-  GTK_TREE_VIEW_COLUMN_RESIZABLE,
   GTK_TREE_VIEW_COLUMN_AUTOSIZE,
   GTK_TREE_VIEW_COLUMN_FIXED
 } GtkTreeViewColumnSizing;
@@ -64,13 +66,19 @@ struct _GtkTreeViewColumn
   GtkWidget *arrow;
   GtkWidget *alignment;
   GdkWindow *window;
+  GtkCellEditable *editable_widget;
   gfloat xalign;
   guint property_changed_signal;
-
   gint spacing;
-  gint fixed_width;
-  gint width;
+
+  /* Sizing fields */
+  /* see gtk+/doc/tree-column-sizing.txt for more information on them */
+  GtkTreeViewColumnSizing column_type;
   gint requested_width;
+  gint button_request;
+  gint resized_width;
+  gint width;
+  gint fixed_width;
   gint min_width;
   gint max_width;
 
@@ -80,7 +88,6 @@ struct _GtkTreeViewColumn
 
   gchar *title;
   GList *cell_list;
-  GtkTreeViewColumnSizing column_type;
 
   /* Sorting */
   guint sort_clicked_signal;
@@ -90,11 +97,14 @@ struct _GtkTreeViewColumn
 
   /* Flags */
   guint visible             : 1;
+  guint resizable           : 1;
   guint clickable           : 1;
   guint dirty               : 1;
   guint show_sort_indicator : 1;
   guint maybe_reordered     : 1;
   guint reorderable         : 1;
+  guint use_resized_width   : 1;
+  guint expand              : 1;
 };
 
 struct _GtkTreeViewColumnClass
@@ -102,15 +112,19 @@ struct _GtkTreeViewColumnClass
   GtkObjectClass parent_class;
 
   void (*clicked) (GtkTreeViewColumn *tree_column);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-GtkType                 gtk_tree_view_column_get_type            (void);
+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_attributes (const gchar             *title,
                                                                  GtkCellRenderer         *cell,
-                                                                 ...);
-void                    gtk_tree_view_column_set_cell_renderer   (GtkTreeViewColumn       *tree_column,
-                                                                 GtkCellRenderer         *cell);
+                                                                 ...) G_GNUC_NULL_TERMINATED;
 void                    gtk_tree_view_column_pack_start          (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell,
                                                                  gboolean                 expand);
@@ -125,7 +139,7 @@ void                    gtk_tree_view_column_add_attribute       (GtkTreeViewCol
                                                                  gint                     column);
 void                    gtk_tree_view_column_set_attributes      (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
-                                                                 ...);
+                                                                 ...) G_GNUC_NULL_TERMINATED;
 void                    gtk_tree_view_column_set_cell_data_func  (GtkTreeViewColumn       *tree_column,
                                                                  GtkCellRenderer         *cell_renderer,
                                                                  GtkTreeCellDataFunc      func,
@@ -139,6 +153,9 @@ gint                    gtk_tree_view_column_get_spacing         (GtkTreeViewCol
 void                    gtk_tree_view_column_set_visible         (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 visible);
 gboolean                gtk_tree_view_column_get_visible         (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_set_resizable       (GtkTreeViewColumn       *tree_column,
+                                                                 gboolean                 resizable);
+gboolean                gtk_tree_view_column_get_resizable       (GtkTreeViewColumn       *tree_column);
 void                    gtk_tree_view_column_set_sizing          (GtkTreeViewColumn       *tree_column,
                                                                  GtkTreeViewColumnSizing  type);
 GtkTreeViewColumnSizing gtk_tree_view_column_get_sizing          (GtkTreeViewColumn       *tree_column);
@@ -161,6 +178,9 @@ 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);
+void                    gtk_tree_view_column_set_expand          (GtkTreeViewColumn       *tree_column,
+                                                                 gboolean                 expand);
+gboolean                gtk_tree_view_column_get_expand          (GtkTreeViewColumn       *tree_column);
 void                    gtk_tree_view_column_set_clickable       (GtkTreeViewColumn       *tree_column,
                                                                  gboolean                 clickable);
 gboolean                gtk_tree_view_column_get_clickable       (GtkTreeViewColumn       *tree_column);
@@ -203,29 +223,18 @@ void                    gtk_tree_view_column_cell_get_size       (GtkTreeViewCol
                                                                  gint                    *y_offset,
                                                                  gint                    *width,
                                                                  gint                    *height);
-void                    gtk_tree_view_column_cell_render         (GtkTreeViewColumn       *tree_column,
-                                                                 GdkWindow               *window,
-                                                                 GdkRectangle            *background_area,
-                                                                 GdkRectangle            *cell_area,
-                                                                 GdkRectangle            *expose_area,
-                                                                 guint                    flags);
-gboolean                gtk_tree_view_column_cell_event          (GtkTreeViewColumn       *tree_column,
-                                                                 GdkEvent                *event,
-                                                                 gchar                   *path_string,
-                                                                 GdkRectangle            *background_area,
-                                                                 GdkRectangle            *cell_area,
-                                                                 guint                    flags);
-gboolean                gtk_tree_view_column_cell_focus          (GtkTreeViewColumn       *tree_column,
-                                                                 gint                     direction,
-                                                                 gboolean                 unfocus);
-gboolean                gtk_tree_view_column_cell_can_focus      (GtkTreeViewColumn       *tree_column);
 gboolean                gtk_tree_view_column_cell_is_visible     (GtkTreeViewColumn       *tree_column);
-void                    gtk_tree_view_column_cell_set_dirty      (GtkTreeViewColumn       *tree_column);
+void                    gtk_tree_view_column_focus_cell          (GtkTreeViewColumn       *tree_column,
+                                                                 GtkCellRenderer         *cell);
+gboolean                gtk_tree_view_column_cell_get_position   (GtkTreeViewColumn       *tree_column,
+                                                                 GtkCellRenderer         *cell_renderer,
+                                                                 gint                    *start_pos,
+                                                                 gint                    *width);
+void                    gtk_tree_view_column_queue_resize        (GtkTreeViewColumn       *tree_column);
+
 
+G_END_DECLS
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
 #endif /* __GTK_TREE_VIEW_COLUMN_H__ */