X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcellrenderer.h;h=375106acf448809360db8b7068d495c3b10f87f5;hb=9b3edbc319afccf221ad0ce75061e6c364572964;hp=686c2bfdbc4c40a3d373625ed8f4315829e6b606;hpb=3c9634c648969a96dae6020243c40481e92755a5;p=~andy%2Fgtk

diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index 686c2bfdb..375106acf 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -32,7 +32,8 @@ typedef enum
   GTK_CELL_RENDERER_PRELIT      = 1 << 1,
   GTK_CELL_RENDERER_INSENSITIVE = 1 << 2,
   /* this flag means the cell is in the sort column/row */
-  GTK_CELL_RENDERER_SORTED      = 1 << 3
+  GTK_CELL_RENDERER_SORTED      = 1 << 3,
+  GTK_CELL_RENDERER_FOCUSED     = 1 << 4
 } GtkCellRendererState;
 
 typedef enum
@@ -43,11 +44,11 @@ typedef enum
 } GtkCellRendererMode;
 
 #define GTK_TYPE_CELL_RENDERER		  (gtk_cell_renderer_get_type ())
-#define GTK_CELL_RENDERER(obj)		  (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRenderer))
-#define GTK_CELL_RENDERER_CLASS(klass)	  (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER, GtkCellRendererClass))
-#define GTK_IS_CELL_RENDERER(obj)	  (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER))
-#define GTK_IS_CELL_RENDERER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER))
-#define GTK_CELL_RENDERER_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRendererClass))
+#define GTK_CELL_RENDERER(obj)		  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRenderer))
+#define GTK_CELL_RENDERER_CLASS(klass)	  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER, GtkCellRendererClass))
+#define GTK_IS_CELL_RENDERER(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER))
+#define GTK_IS_CELL_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER))
+#define GTK_CELL_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER, GtkCellRendererClass))
 
 typedef struct _GtkCellRenderer GtkCellRenderer;
 typedef struct _GtkCellRendererClass GtkCellRendererClass;
@@ -69,6 +70,9 @@ struct _GtkCellRenderer
   guint visible : 1;
   guint is_expander : 1;
   guint is_expanded : 1;
+  guint cell_background_set : 1;
+  guint sensitive : 1;
+  guint editing : 1;
 };
 
 struct _GtkCellRendererClass
@@ -84,7 +88,7 @@ struct _GtkCellRendererClass
 				      gint                 *width,
 				      gint                 *height);
   void             (* render)        (GtkCellRenderer      *cell,
-				      GdkWindow            *window,
+				      GdkDrawable          *window,
 				      GtkWidget            *widget,
 				      GdkRectangle         *background_area,
 				      GdkRectangle         *cell_area,
@@ -104,6 +108,16 @@ struct _GtkCellRendererClass
 				      GdkRectangle         *background_area,
 				      GdkRectangle         *cell_area,
 				      GtkCellRendererState  flags);
+
+  /* Signals */
+  void (* editing_canceled) (GtkCellRenderer *cell);
+  void (* editing_started)  (GtkCellRenderer *cell,
+			     GtkCellEditable *editable,
+			     const gchar     *path);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
 };
 
 GType            gtk_cell_renderer_get_type       (void) G_GNUC_CONST;
@@ -143,8 +157,14 @@ void             gtk_cell_renderer_get_fixed_size (GtkCellRenderer      *cell,
 						   gint                 *width,
 						   gint                 *height);
 
+/* For use by cell renderer implementations only */
+#ifndef GTK_DISABLE_DEPRECATED
+void gtk_cell_renderer_editing_canceled (GtkCellRenderer *cell);
+#endif
+void gtk_cell_renderer_stop_editing     (GtkCellRenderer *cell,
+				         gboolean         canceled);
+
 
- 
 G_END_DECLS
 
 #endif /* __GTK_CELL_RENDERER_H__ */