X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcellview.h;h=82e956e64389433a9918f32910c7fcc96e5bb73d;hb=3b2182e711ace4a2d6843848208224cd7525d530;hp=a214fa80197c282a04bf4d5dae662d370ca8e891;hpb=7b287e64bc239d333b49444261d08982ae8b7c3a;p=~andy%2Fgtk

diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index a214fa801..82e956e64 100644
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -12,20 +12,20 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
 #ifndef __GTK_CELL_VIEW_H__
 #define __GTK_CELL_VIEW_H__
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkcellrenderer.h>
+#include <gtk/gtkcellarea.h>
+#include <gtk/gtkcellareacontext.h>
 #include <gtk/gtktreemodel.h>
 
 G_BEGIN_DECLS
@@ -46,32 +46,49 @@ struct _GtkCellView
   GtkWidget parent_instance;
 
   /*< private >*/
-  GtkCellViewPrivate *GSEAL (priv);
+  GtkCellViewPrivate *priv;
 };
 
 struct _GtkCellViewClass
 {
   GtkWidgetClass parent_class;
-};
 
-GType             gtk_cell_view_get_type               (void) G_GNUC_CONST;
-GtkWidget        *gtk_cell_view_new                    (void);
-GtkWidget        *gtk_cell_view_new_with_text          (const gchar     *text);
-GtkWidget        *gtk_cell_view_new_with_markup        (const gchar     *markup);
-GtkWidget        *gtk_cell_view_new_with_pixbuf        (GdkPixbuf       *pixbuf);
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
 
+GType             gtk_cell_view_get_type                (void) G_GNUC_CONST;
+GtkWidget        *gtk_cell_view_new                     (void);
+GtkWidget        *gtk_cell_view_new_with_context        (GtkCellArea        *area,
+                                                         GtkCellAreaContext *context);
+GtkWidget        *gtk_cell_view_new_with_text           (const gchar     *text);
+GtkWidget        *gtk_cell_view_new_with_markup         (const gchar     *markup);
+GtkWidget        *gtk_cell_view_new_with_pixbuf         (GdkPixbuf       *pixbuf);
 void              gtk_cell_view_set_model               (GtkCellView     *cell_view,
                                                          GtkTreeModel    *model);
+GtkTreeModel     *gtk_cell_view_get_model               (GtkCellView     *cell_view);
 void              gtk_cell_view_set_displayed_row       (GtkCellView     *cell_view,
                                                          GtkTreePath     *path);
 GtkTreePath      *gtk_cell_view_get_displayed_row       (GtkCellView     *cell_view);
+void              gtk_cell_view_set_background_rgba     (GtkCellView     *cell_view,
+                                                         const GdkRGBA   *rgba);
+gboolean          gtk_cell_view_get_draw_sensitive      (GtkCellView     *cell_view);
+void              gtk_cell_view_set_draw_sensitive      (GtkCellView     *cell_view,
+                                                         gboolean         draw_sensitive);
+gboolean          gtk_cell_view_get_fit_model           (GtkCellView     *cell_view);
+void              gtk_cell_view_set_fit_model           (GtkCellView     *cell_view,
+                                                         gboolean         fit_model);
+
+GDK_DEPRECATED_IN_3_0_FOR(gtk_widget_get_preferred_size)
 gboolean          gtk_cell_view_get_size_of_row         (GtkCellView     *cell_view,
                                                          GtkTreePath     *path,
                                                          GtkRequisition  *requisition);
-
+GDK_DEPRECATED_IN_3_4_FOR(gtk_cell_view_set_background_rgba)
 void              gtk_cell_view_set_background_color    (GtkCellView     *cell_view,
                                                          const GdkColor  *color);
-GList            *gtk_cell_view_get_cell_renderers      (GtkCellView     *cell_view);
 
 G_END_DECLS