Handle float and uint style properties

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

diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h
index 2c35d0965fafb74c94dc5d4c5572957532ba15ad..7c645bf3608f1528efdf3e7ad301dcb8785e5908 100644 (file)
--- a/gtk/gtkcellrenderercombo.h
+++ b/gtk/gtkcellrenderercombo.h
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
 
 #ifndef __GTK_CELL_RENDERER_COMBO_H__
 #define __GTK_CELL_RENDERER_COMBO_H__
@@ -32,25 +35,28 @@ G_BEGIN_DECLS
 #define GTK_IS_CELL_RENDERER_COMBO(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_COMBO))
 #define GTK_IS_CELL_RENDERER_COMBO_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_COMBO))
 #define GTK_CELL_RENDERER_COMBO_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererTextClass))
-                                                
-typedef struct _GtkCellRendererCombo GtkCellRendererCombo;
-typedef struct _GtkCellRendererComboClass GtkCellRendererComboClass;
+
+typedef struct _GtkCellRendererCombo              GtkCellRendererCombo;
+typedef struct _GtkCellRendererComboPrivate       GtkCellRendererComboPrivate;
+typedef struct _GtkCellRendererComboClass         GtkCellRendererComboClass;
 
 struct _GtkCellRendererCombo
 {
   GtkCellRendererText parent;
 
-  GtkTreeModel *model;
-  gint          text_column;
-  gboolean      has_entry;
-  
   /*< private >*/
-  guint         focus_out_id;
+  GtkCellRendererComboPrivate *priv;
 };
 
 struct _GtkCellRendererComboClass
 {
   GtkCellRendererTextClass parent;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType            gtk_cell_renderer_combo_get_type (void) G_GNUC_CONST;
@@ -58,4 +64,4 @@ GtkCellRenderer *gtk_cell_renderer_combo_new      (void);
 
 G_END_DECLS
 
-#endif
+#endif /* __GTK_CELL_RENDERER_COMBO_H__ */