X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkiconview.h;h=2adcc64c9887a0be1f0d6fefabf9945d93a7823c;hb=67f5e595a796a8321d6dc7737c58476564998c07;hp=cdf79b7fc0d595e0ef80ed3d31203618ba8c2c4b;hpb=e4af3782d3046948b937db8651630bebeb148b50;p=~andy%2Fgtk

diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h
index cdf79b7fc..2adcc64c9 100644
--- a/gtk/gtkiconview.h
+++ b/gtk/gtkiconview.h
@@ -12,21 +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/>.
  */
 
+#ifndef __GTK_ICON_VIEW_H__
+#define __GTK_ICON_VIEW_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_ICON_VIEW_H__
-#define __GTK_ICON_VIEW_H__
-
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtktreemodel.h>
 #include <gtk/gtkcellrenderer.h>
+#include <gtk/gtkcellarea.h>
 #include <gtk/gtkselection.h>
 #include <gtk/gtktooltip.h>
 
@@ -81,7 +80,7 @@ struct _GtkIconView
 {
   GtkContainer parent;
 
-  /* <private> */
+  /*< private >*/
   GtkIconViewPrivate *priv;
 };
 
@@ -89,10 +88,6 @@ struct _GtkIconViewClass
 {
   GtkContainerClass parent_class;
 
-  void    (* set_scroll_adjustments) (GtkIconView      *icon_view,
-				      GtkAdjustment    *hadjustment,
-				      GtkAdjustment    *vadjustment);
-  
   void    (* item_activated)         (GtkIconView      *icon_view,
 				      GtkTreePath      *path);
   void    (* selection_changed)      (GtkIconView      *icon_view);
@@ -106,10 +101,17 @@ struct _GtkIconViewClass
 				      GtkMovementStep   step,
 				      gint              count);
   gboolean (* activate_cursor_item)  (GtkIconView      *icon_view);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType          gtk_icon_view_get_type          (void) G_GNUC_CONST;
 GtkWidget *    gtk_icon_view_new               (void);
+GtkWidget *    gtk_icon_view_new_with_area     (GtkCellArea    *area);
 GtkWidget *    gtk_icon_view_new_with_model    (GtkTreeModel   *model);
 
 void           gtk_icon_view_set_model         (GtkIconView    *icon_view,
@@ -150,7 +152,6 @@ void           gtk_icon_view_set_item_padding  (GtkIconView    *icon_view,
 					        gint            item_padding);
 gint           gtk_icon_view_get_item_padding  (GtkIconView    *icon_view);
 
-
 GtkTreePath *  gtk_icon_view_get_path_at_pos   (GtkIconView     *icon_view,
 						gint             x,
 						gint             y);
@@ -162,6 +163,11 @@ gboolean       gtk_icon_view_get_item_at_pos   (GtkIconView     *icon_view,
 gboolean       gtk_icon_view_get_visible_range (GtkIconView      *icon_view,
 						GtkTreePath     **start_path,
 						GtkTreePath     **end_path);
+GDK_AVAILABLE_IN_3_8
+void           gtk_icon_view_set_activate_on_single_click (GtkIconView  *icon_view,
+                                                           gboolean      single);
+GDK_AVAILABLE_IN_3_8
+gboolean       gtk_icon_view_get_activate_on_single_click (GtkIconView  *icon_view);
 
 void           gtk_icon_view_selected_foreach   (GtkIconView            *icon_view,
 						 GtkIconViewForeachFunc  func,
@@ -226,7 +232,7 @@ gboolean               gtk_icon_view_get_dest_item_at_pos     (GtkIconView
 							       gint                      drag_y,
 							       GtkTreePath             **path,
 							       GtkIconViewDropPosition  *pos);
-GdkPixmap             *gtk_icon_view_create_drag_icon         (GtkIconView              *icon_view,
+cairo_surface_t       *gtk_icon_view_create_drag_icon         (GtkIconView              *icon_view,
 							       GtkTreePath              *path);
 
 void    gtk_icon_view_convert_widget_to_bin_window_coords     (GtkIconView *icon_view,
@@ -234,6 +240,11 @@ void    gtk_icon_view_convert_widget_to_bin_window_coords     (GtkIconView *icon
                                                                gint         wy,
                                                                gint        *bx,
                                                                gint        *by);
+GDK_AVAILABLE_IN_3_6
+gboolean gtk_icon_view_get_cell_rect                          (GtkIconView     *icon_view,
+							       GtkTreePath     *path,
+							       GtkCellRenderer *cell,
+							       GdkRectangle    *rect);
 
 
 void    gtk_icon_view_set_tooltip_item                        (GtkIconView     *icon_view,