r434 - in trunk/src/target/OM-2007/applications/openmoko-mainmenu: data src

tongsong_li at gta01.hmw-consulting.de tongsong_li at gta01.hmw-consulting.de
Wed Dec 20 01:54:56 CET 2006


Author: tongsong_li
Date: 2006-12-20 01:54:28 +0100 (Wed, 20 Dec 2006)
New Revision: 434

Modified:
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/app-history.c
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/app-history.h
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.h
   trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c
Log:
update mokoiconview widget

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am	2006-12-19 17:45:01 UTC (rev 433)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/data/Makefile.am	2006-12-20 00:54:28 UTC (rev 434)
@@ -1,5 +1,5 @@
-EXTRA_DIST = 
+EXTRA_DIST = main_menu_sel_icon.png
 
 resourcedir = $(pkgdatadir)
-resource_DATA = 
+resource_DATA = main_menu_sel_icon.png
 

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/app-history.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/app-history.c	2006-12-19 17:45:01 UTC (rev 433)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/app-history.c	2006-12-20 00:54:28 UTC (rev 434)
@@ -1 +1,7 @@
 #include "app-history.h"
+
+void
+moko_add_history_app_image (MokoPixmapButton* btn, GdkPixbuf *pixbuf)
+{
+  moko_pixmap_button_set_finger_toolbox_btn_center_image(btn, gtk_image_new_from_pixbuf (pixbuf)); 
+}

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/app-history.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/app-history.h	2006-12-19 17:45:01 UTC (rev 433)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/app-history.h	2006-12-20 00:54:28 UTC (rev 434)
@@ -2,5 +2,13 @@
 #define _MOKO_APP_HISTORY_H
 
 #include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <libmokoui/moko-pixmap-button.h>
 
+void
+moko_update_history_app_list ();
+
+void
+moko_add_history_app_image (MokoPixmapButton* btn, GdkPixbuf *pixbuf);
+
 #endif "app-history.h"

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c	2006-12-19 17:45:01 UTC (rev 433)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.c	2006-12-20 00:54:28 UTC (rev 434)
@@ -45,7 +45,7 @@
 
     for (i=0; i<4; i++)
     	{
-    	    mma->history[i] =  moko_finger_tool_box_add_button( mma->toolbox );
+    	    mma->history[i] =  moko_finger_tool_box_add_button (mma->toolbox);
            gtk_widget_show (mma->history[i]);
     	}
    
@@ -61,13 +61,11 @@
     gtk_widget_show_all( GTK_WIDGET(mma->window) );
 
     gtk_widget_show (GTK_WIDGET (mma->wheel));
-    //gtk_widget_reparent (GTK_WIDGET (mma->wheel), GTK_WIDGET (mma->window));
     gtk_widget_show (GTK_WIDGET (mma->toolbox));
-    //gtk_widget_reparent (GTK_WIDGET (mma->toolbox), GTK_WIDGET (mma->window));
 
-    //g_debug( "openmoko-finger-demo entering main loop" );
+    moko_sample_hisory_app_fill (mma->history[0]);
+
     gtk_main();
-    //g_debug( "openmoko-finger-demo left main loop" );
 
     if (mma)
     	  g_free (mma);

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h	2006-12-19 17:45:01 UTC (rev 433)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/main.h	2006-12-20 00:54:28 UTC (rev 434)
@@ -23,6 +23,7 @@
 #include <libmokoui/moko-finger-tool-box.h>
 #include <libmokoui/moko-finger-window.h>
 #include <libmokoui/moko-finger-wheel.h>
+#include <libmokoui/moko-pixmap-button.h>
 
 #include <gtk/gtkalignment.h>
 #include <gtk/gtkbutton.h>
@@ -48,7 +49,8 @@
     MokoMainMenu *mm;
     MokoMenuList *list;
 
-    GtkButton *history[3];
+    //GtkButton *history[3];
+    MokoPixmapButton *history[4]
 
 };
 

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c	2006-12-19 17:45:01 UTC (rev 433)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.c	2006-12-20 00:54:28 UTC (rev 434)
@@ -140,22 +140,23 @@
     //mm->icon_view = gtk_icon_view_new ();
     mm->icon_view = MOKO_ICON_VIEW(moko_icon_view_new());
     gtk_widget_show (mm->icon_view);
-    gtk_icon_view_set_columns (mm->icon_view, COLUMN_NUM);
-    //gtk_icon_view_set_margin (mm->icon_view, ICON_MARGIN);
-    //gtk_icon_view_set_row_spacing (mm->icon_view, ROW_SPACING);
-    //gtk_icon_view_set_column_spacing (mm->icon_view, COLUMN_SPACING);
-    //gtk_icon_view_set_selection_mode (mm->icon_view, GTK_SELECTION_SINGLE);
-    gtk_widget_show (mm->icon_view);
+    //moko_icon_view_set_item_width(mm->icon_view, ITEM_WIDTH);
+    //moko_icon_view_set_columns (mm->icon_view, COLUMN_NUM);
+    moko_icon_view_set_margin (mm->icon_view, ITEM_MARGIN);
+    moko_icon_view_set_row_spacing (mm->icon_view, ROW_SPACING);
+    //moko_icon_view_set_column_spacing (mm->icon_view, COLUMN_SPACING);
+    //moko_icon_view_set_selection_mode (mm->icon_view, GTK_SELECTION_SINGLE);
 
     mm->list_store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER);
 
-    gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (mm->icon_view), PIXBUF_COLUMN);
-    gtk_icon_view_set_text_column (GTK_ICON_VIEW (mm->icon_view), TEXT_COLUMN);
-    gtk_icon_view_set_model (GTK_ICON_VIEW (mm->icon_view), GTK_TREE_MODEL (mm->list_store));
+    moko_icon_view_set_pixbuf_column (GTK_ICON_VIEW (mm->icon_view), PIXBUF_COLUMN);
+    moko_icon_view_set_text_column (GTK_ICON_VIEW (mm->icon_view), TEXT_COLUMN);
+    //gtk_icon_view_set_model (GTK_ICON_VIEW (mm->icon_view), GTK_TREE_MODEL (mm->list_store));
+    moko_icon_view_set_model (GTK_ICON_VIEW (mm->icon_view), GTK_TREE_MODEL (mm->list_store));
 
     mm->scrolled = gtk_scrolled_window_new (NULL, NULL);
     gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (mm->scrolled),
-				  GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+				  GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
     gtk_widget_show (mm->scrolled);
    // gtk_scrolled_window_add_with_viewport (GTK_CONTAINER (mm->scrolled),
     //						mm->icon_view);
@@ -167,7 +168,7 @@
     mm->hbox = gtk_hbox_new (FALSE, FALSE);
     gtk_widget_show (mm->hbox);
     
-    gtk_box_pack_start (mm, bg_main, FALSE, FALSE, 0);
+    //gtk_box_pack_start (mm, bg_main, FALSE, FALSE, 0);
     gtk_container_add (bg_main, mm->hbox); 
     gtk_box_pack_start (mm->hbox, mm->section_name, TRUE, TRUE, 10);
     gtk_box_pack_end (mm->hbox, mm->item_total, FALSE, FALSE, 10);

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h	2006-12-19 17:45:01 UTC (rev 433)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mainmenu.h	2006-12-20 00:54:28 UTC (rev 434)
@@ -38,12 +38,16 @@
 G_BEGIN_DECLS
 /*widgets property(s)*/
 #define COLUMN_NUM 		3
-#define ICON_SIZE_W 		100
-#define ICON_SIZE_H 			100
-#define ICON_MARGIN 		30
-#define ROW_SPACING 		30
-#define COLUMN_SPACING 	30
+#define ITEM_WIDTH 			140
+#define ITEM_HEIGHT 		120
+#define ITEM_MARGIN 		0
+#define ROW_SPACING 		20
+#define COLUMN_SPACING 	0
 #define ITME_TOTAL_WIDTH 	7
+
+#define PIXBUF_WIDTH		100
+#define PIXBUF_HEIGHT		100
+
 #define SECTION_ALG_X 		0.6
 #define SECTION_ALG_Y 		0.5
 #define SECTION_X_PADDING 	0

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c	2006-12-19 17:45:01 UTC (rev 433)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.c	2006-12-20 00:54:28 UTC (rev 434)
@@ -1,8 +1,19 @@
 #include "mokoiconview.h"
 #include "callbacks.h"
 
+#define DEBUG(obj) 		g_debug ("***********************");\
+						g_debug ("%s",obj);
+						
+						
+
 #define MOKO_MAX(arg1,arg2)		arg1>arg2?arg1:arg2
 
+#define MOKO_MIN(arg1,arg2)		arg1<arg2?arg1:arg2
+
+#define P_(obj)		(obj)
+
+#define MOKO_ICON_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MOKO_TYPE_ICON_VIEW, MokoIconViewPrivate))
+
 #define VALID_MODEL_AND_COLUMNS(obj) ((obj)->priv->model != NULL && \
                                       ((obj)->priv->pixbuf_column != -1 || \
 				       (obj)->priv->text_column != -1 || \
@@ -10,6 +21,8 @@
 
 #define ICON_TEXT_PADDING 3
 
+#define FRAME_OFFSET 10
+
 typedef struct 
 {
   GtkTreeIter iter;
@@ -22,16 +35,18 @@
   gint width, height;
 
   gint pixbuf_x, pixbuf_y;
+  gint pixbuf_offset_x, pixbuf_offset_y;
   gint pixbuf_height, pixbuf_width;
 
   gint layout_x, layout_y;
+  gint layout_offset_x, layout_offset_y;
   gint layout_width, layout_height;
 
   guint selected : 1;
   guint selected_before_rubberbanding : 1;
-} GtkIconViewItem;
+} MokoIconViewItem;
 
-struct _GtkIconViewPrivate
+struct _MokoIconViewPrivate
 {
   gint width, height;
 
@@ -60,13 +75,24 @@
   gint scroll_value_diff;
   gint event_last_x, event_last_y;
 
-  GtkIconViewItem *anchor_item;
-  GtkIconViewItem *cursor_item;
+  MokoIconViewItem *anchor_item;
+  MokoIconViewItem *cursor_item;
 
+  GdkPixbuf *decoration; //Item decorated image.
+
+  gint pixbuf_offset_x, pixbuf_offset_y;
+  gint pixbuf_height, pixbuf_width;
+
+  gint layout_offset_x, layout_offset_y;
+  gint layout_width, layout_height;
+
+  gint max_text_len;
+
+
   guint ctrl_pressed : 1;
   guint shift_pressed : 1;
   
-  GtkIconViewItem *last_single_clicked;
+  MokoIconViewItem *last_single_clicked;
 
 #ifdef DND_WORKS
   /* Drag-and-drop. */
@@ -88,75 +114,346 @@
   gint margin;
 };
 
-enum {
-    ICON_VIEW_SIGNAL,
-    LAST_SIGNAL
+/* Signals */
+enum
+{
+  ITEM_ACTIVATED,
+  SELECTION_CHANGED,
+  SELECT_ALL,
+  UNSELECT_ALL,
+  SELECT_CURSOR_ITEM,
+  TOGGLE_CURSOR_ITEM,
+  MOVE_CURSOR,
+  ACTIVATE_CURSOR_ITEM,
+  LAST_SIGNAL
 };
 
-G_DEFINE_TYPE (MokoIconView, moko_icon_view, GTK_TYPE_ICON_VIEW)
+/* Properties */
+enum
+{
+  PROP_0,
+  PROP_PIXBUF_COLUMN,
+  PROP_TEXT_COLUMN,
+  PROP_MARKUP_COLUMN,  
+  PROP_SELECTION_MODE,
+  PROP_ORIENTATION,
+  PROP_MODEL,
+  PROP_COLUMNS,
+  PROP_ITEM_WIDTH,
+  PROP_SPACING,
+  PROP_ROW_SPACING,
+  PROP_COLUMN_SPACING,
+  PROP_MARGIN
+};
 
+//GdkPixbuf *frame;
+
+/* GObject signals */
 static void 
-moko_icon_view_class_init(MokoIconViewClass *klass);
+moko_icon_view_finalize     (GObject      *object);
 
 static void 
-moko_icon_view_init(MokoIconView *self);
+moko_icon_view_set_property (GObject      *object,
+					guint         prop_id,
+					const GValue *value,
+					GParamSpec   *pspec);
 
+static void 
+moko_icon_view_get_property (GObject      *object,
+					guint         prop_id,
+					GValue       *value,
+					GParamSpec   *pspec);
+
+/* GObject signals */
+static void 
+moko_icon_view_finalize     (GObject      *object);
+
+static void 
+moko_icon_view_set_property (GObject      *object,
+					guint         prop_id,
+					const GValue *value,
+					GParamSpec   *pspec);
+
 static void
-moko_icon_view_realize (GtkWidget *widget);
+moko_icon_view_get_property (GObject      *object,
+					guint         prop_id,
+					GValue       *value,
+					GParamSpec   *pspec);
 
+
+/* GtkObject signals */
+static void 
+moko_icon_view_destroy (GtkObject *object);
+
+/* GtkWidget signals */
+static void     
+moko_icon_view_realize        (GtkWidget      *widget);
+
+static void     
+moko_icon_view_unrealize      (GtkWidget      *widget);
+
+static void     
+moko_icon_view_map            (GtkWidget      *widget);
+
+static void     
+moko_icon_view_size_request   (GtkWidget      *widget,
+					      GtkRequisition *requisition);
+
+static void     
+moko_icon_view_size_allocate  (GtkWidget      *widget,
+					      GtkAllocation  *allocation);
+
+static gboolean 
+moko_icon_view_expose         (GtkWidget      *widget,
+					      GdkEventExpose *expose);
+
+static gboolean 
+moko_icon_view_motion         (GtkWidget      *widget,
+					      GdkEventMotion *event);
+
+static gboolean 
+moko_icon_view_button_press   (GtkWidget      *widget,
+					      GdkEventButton *event);
+
 static gboolean
-moko_icon_view_expose (GtkWidget *widget,
-		      GdkEventExpose *expose);
+moko_icon_view_button_release (GtkWidget      *widget,
+					      GdkEventButton *event);
 
-static guint icon_view_signals[LAST_SIGNAL] = { 0 };
+/* MokoIconView signals */
+static void     
+moko_icon_view_set_adjustments           (MokoIconView   *icon_view,
+							 GtkAdjustment *hadj,
+							 GtkAdjustment *vadj);
 
+static void     
+moko_icon_view_real_select_all           (MokoIconView   *icon_view);
 
-static void
-moko_icon_view_map (GtkWidget *widget)
-{
-  GtkIconView *icon_view;
+static void     
+moko_icon_view_real_unselect_all         (MokoIconView   *icon_view);
 
-  icon_view = GTK_ICON_VIEW (widget);
+static void     
+moko_icon_view_real_select_cursor_item   (MokoIconView   *icon_view);
 
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+static void     
+moko_icon_view_real_toggle_cursor_item   (MokoIconView   *icon_view);
 
-  gdk_window_show (icon_view->priv->bin_window);
-  gdk_window_show (widget->window);
-}
+static gboolean 
+moko_icon_view_real_activate_cursor_item (MokoIconView   *icon_view);
 
-static void
-moko_icon_view_unrealize (GtkWidget *widget)
+/* Internal functions */
+static void       
+moko_icon_view_adjustment_changed          (GtkAdjustment   *adjustment,
+							     MokoIconView     *icon_view);
+
+static void       
+moko_icon_view_layout                      (MokoIconView     *icon_view);
+
+static void       
+moko_icon_view_paint_item                  (MokoIconView     *icon_view,
+							     MokoIconViewItem *item,
+							     GdkRectangle    *area);
+
+static void       
+moko_icon_view_paint_rubberband            (MokoIconView     *icon_view,
+							     GdkRectangle    *area);
+
+static void       
+moko_icon_view_queue_draw_item             (MokoIconView     *icon_view,
+							     MokoIconViewItem *item);
+
+static void       
+moko_icon_view_queue_layout                (MokoIconView     *icon_view);
+
+static void       
+moko_icon_view_set_cursor_item             (MokoIconView     *icon_view,
+							     MokoIconViewItem *item);
+
+static void       
+moko_icon_view_start_rubberbanding         (MokoIconView     *icon_view,
+							     gint             x,
+							     gint             y);
+
+static void       
+moko_icon_view_stop_rubberbanding          (MokoIconView     *icon_view);
+
+static void       
+moko_icon_view_update_rubberband_selection (MokoIconView     *icon_view);
+
+static gboolean   
+moko_icon_view_item_hit_test               (MokoIconViewItem *item,
+							     gint             x,
+							     gint             y,
+							     gint             width,
+							     gint             height);
+
+#ifdef DND_WORKS
+static gboolean   
+moko_icon_view_maybe_begin_dragging_items  (MokoIconView     *icon_view,
+							     GdkEventMotion  *event);
+#endif
+
+static gboolean   
+moko_icon_view_unselect_all_internal       (MokoIconView     *icon_view);
+
+static void       
+moko_icon_view_calculate_item_size         (MokoIconView     *icon_view,
+							     MokoIconViewItem *item,
+							     gint             item_width);
+
+static void       
+moko_icon_view_update_rubberband           (gpointer         data);
+
+static void       
+moko_icon_view_item_invalidate_size        (MokoIconViewItem *item);
+
+static void       
+moko_icon_view_invalidate_sizes            (MokoIconView     *icon_view);
+
+static void       
+moko_icon_view_add_move_binding            (GtkBindingSet   *binding_set,
+							     guint            keyval,
+							     guint            modmask,
+							     GtkMovementStep  step,
+							     gint             count);
+
+static gboolean   
+moko_icon_view_real_move_cursor            (MokoIconView     *icon_view,
+							     GtkMovementStep  step,
+							     gint             count);
+
+static void       
+moko_icon_view_move_cursor_up_down         (MokoIconView     *icon_view,
+							     gint             count);
+
+static void       
+moko_icon_view_move_cursor_page_up_down    (MokoIconView     *icon_view,
+							     gint             count);
+
+static void       
+moko_icon_view_move_cursor_left_right      (MokoIconView     *icon_view,
+							     gint             count);
+
+static void      
+moko_icon_view_move_cursor_start_end       (MokoIconView     *icon_view,
+							     gint             count);
+
+static void       
+moko_icon_view_scroll_to_item              (MokoIconView     *icon_view,
+							     MokoIconViewItem *item);
+
+static GdkPixbuf *
+moko_icon_view_get_item_icon               (MokoIconView     *icon_view,
+							     MokoIconViewItem *item);
+
+static void       
+moko_icon_view_update_item_text            (MokoIconView     *icon_view,
+							     MokoIconViewItem *item);
+
+static void       
+moko_icon_view_select_item                 (MokoIconView     *icon_view,
+							     MokoIconViewItem *item);
+
+static void       
+moko_icon_view_unselect_item               (MokoIconView     *icon_view,
+							     MokoIconViewItem *item);
+
+static gboolean 
+moko_icon_view_select_all_between            (MokoIconView     *icon_view,
+							     MokoIconViewItem *anchor,
+							     MokoIconViewItem *cursor);
+
+static MokoIconViewItem *
+moko_icon_view_get_item_at_pos (MokoIconView *icon_view,
+						       gint         x,
+						       gint         y);
+
+
+/* Accessibility Support */
+static AtkObject *
+moko_icon_view_get_accessible  (GtkWidget   *widget);
+
+
+void
+moko_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
+                                  GValue       *return_value,
+                                  guint         n_param_values,
+                                  const GValue *param_values,
+                                  gpointer      invocation_hint,
+                                  gpointer      marshal_data)
 {
-  GtkIconView *icon_view;
+  typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer     data1,
+                                                    gpointer     arg_1,
+                                                    gpointer     arg_2,
+                                                    gpointer     data2);
+  register GMarshalFunc_VOID__OBJECT_OBJECT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
 
-  icon_view = GTK_ICON_VIEW (widget);
+  g_return_if_fail (n_param_values == 3);
 
-  gdk_window_set_user_data (icon_view->priv->bin_window, NULL);
-  gdk_window_destroy (icon_view->priv->bin_window);
-  icon_view->priv->bin_window = NULL;
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 
-  /* GtkWidget::unrealize destroys children and widget->window */
-//  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    //(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+  callback (data1,
+            g_value_get_object (param_values + 1),
+            g_value_get_object (param_values + 2),
+            data2);
 }
 
-static void
-moko_icon_view_size_request (GtkWidget      *widget,
-			    GtkRequisition *requisition)
+void
+moko_marshal_BOOLEAN__ENUM_INT (GClosure     *closure,
+                                GValue       *return_value,
+                                guint         n_param_values,
+                                const GValue *param_values,
+                                gpointer      invocation_hint,
+                                gpointer      marshal_data)
 {
-  GtkIconView *icon_view;
+  typedef gboolean (*GMarshalFunc_BOOLEAN__ENUM_INT) (gpointer     data1,
+                                                      gint         arg_1,
+                                                      gint         arg_2,
+                                                      gpointer     data2);
+  register GMarshalFunc_BOOLEAN__ENUM_INT callback;
+  register GCClosure *cc = (GCClosure*) closure;
+  register gpointer data1, data2;
+  gboolean v_return;
 
-  icon_view = GTK_ICON_VIEW (widget);
+  g_return_if_fail (return_value != NULL);
+  g_return_if_fail (n_param_values == 3);
 
-  requisition->width = icon_view->priv->width;
-  requisition->height = icon_view->priv->height;
+  if (G_CCLOSURE_SWAP_DATA (closure))
+    {
+      data1 = closure->data;
+      data2 = g_value_peek_pointer (param_values + 0);
+    }
+  else
+    {
+      data1 = g_value_peek_pointer (param_values + 0);
+      data2 = closure->data;
+    }
+  callback = (GMarshalFunc_BOOLEAN__ENUM_INT) (marshal_data ? marshal_data : cc->callback);
+
+  v_return = callback (data1,
+                       g_value_get_enum (param_values + 1),
+                       g_value_get_int (param_values + 2),
+                       data2);
+
+  g_value_set_boolean (return_value, v_return);
 }
 
-static void
-moko_icon_view_size_allocate (GtkWidget      *widget,
-			     GtkAllocation  *allocation);
+static GtkContainerClass *parent_class = NULL;
 
+static guint moko_icon_view_signals[LAST_SIGNAL] = { 0 };
 
+G_DEFINE_TYPE (MokoIconView, moko_icon_view, GTK_TYPE_CONTAINER);
 
 /**
 *@brief initialize	MokoIconView class.
@@ -166,46 +463,354 @@
 static void 
 moko_icon_view_class_init(MokoIconViewClass* klass) /* Class Initialization */
 {
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
-  //widget_class->realize = moko_icon_view_realize;
-  //widget_class->expose_event = moko_icon_view_expose;
-  //widget_class->unrealize = moko_icon_view_unrealize;
-  //widget_class->map = moko_icon_view_map;
-  //widget_class->size_request = moko_icon_view_size_request;
+  GObjectClass *gobject_class;
+  GtkObjectClass *object_class;
+  GtkWidgetClass *widget_class;
+  GtkBindingSet *binding_set;
+  
+  parent_class = g_type_class_peek_parent (klass);
+  binding_set = gtk_binding_set_by_class (klass);
+
+  g_type_class_add_private (klass, sizeof (MokoIconViewPrivate));
+
+  gobject_class = (GObjectClass *) klass;
+  object_class = (GtkObjectClass *) klass;
+  widget_class = (GtkWidgetClass *) klass;
+
+  gobject_class->finalize = moko_icon_view_finalize;
+  gobject_class->set_property = moko_icon_view_set_property;
+  gobject_class->get_property = moko_icon_view_get_property;
+  
+  object_class->destroy = moko_icon_view_destroy;
+
+  //widget_class = GTK_WIDGET_CLASS(klass);
+  widget_class->realize = moko_icon_view_realize;
+  widget_class->unrealize = moko_icon_view_unrealize;
+  widget_class->map = moko_icon_view_map;
+  widget_class->size_request = moko_icon_view_size_request;
   widget_class->size_allocate = moko_icon_view_size_allocate;
+  widget_class->expose_event = moko_icon_view_expose;
+  widget_class->motion_notify_event = moko_icon_view_motion;
+  widget_class->button_press_event = moko_icon_view_button_press;
+  widget_class->button_release_event = moko_icon_view_button_release;
+  widget_class->get_accessible = moko_icon_view_get_accessible;
+
+
+  klass->set_scroll_adjustments = moko_icon_view_set_adjustments;
+  klass->select_all = moko_icon_view_real_select_all;
+  klass->unselect_all = moko_icon_view_real_unselect_all;
+  klass->select_cursor_item = moko_icon_view_real_select_cursor_item;
+  klass->toggle_cursor_item = moko_icon_view_real_toggle_cursor_item;
+  klass->activate_cursor_item = moko_icon_view_real_activate_cursor_item;  
+  klass->move_cursor = moko_icon_view_real_move_cursor;
+
+
+  /* Properties */
+  /**
+   * MokoIconView:selection-mode:
+   * 
+   * The ::selection-mode property specifies the selection mode of
+   * icon view. If the mode is #GTK_SELECTION_MULTIPLE, rubberband selection
+   * is enabled, for the other modes, only keyboard selection is possible.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+				   PROP_SELECTION_MODE,
+				   g_param_spec_enum ("selection_mode",
+						      P_("Selection mode"),
+						      P_("The selection mode"),
+						      GTK_TYPE_SELECTION_MODE,
+						      GTK_SELECTION_SINGLE,
+						      G_PARAM_READWRITE));
+
+  /**
+   * MokoIconView:pixbuf-column:
+   *
+   * The ::pixbuf-column property contains the number of the model column
+   * containing the pixbufs which are displayed. The pixbuf column must be 
+   * of type #GDK_TYPE_PIXBUF. Setting this property to -1 turns off the
+   * display of pixbufs.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+				   PROP_PIXBUF_COLUMN,
+				   g_param_spec_int ("pixbuf_column",
+						     P_("Pixbuf column"),
+						     P_("Model column used to retrieve the icon pixbuf from"),
+						     -1, G_MAXINT, -1,
+						     G_PARAM_READWRITE));
+
+  /**
+   * MokoIconView:text-column:
+   *
+   * The ::text-column property contains the number of the model column
+   * containing the texts which are displayed. The text column must be 
+   * of type #G_TYPE_STRING. If this property and the :markup-column 
+   * property are both set to -1, no texts are displayed.   
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+				   PROP_TEXT_COLUMN,
+				   g_param_spec_int ("text_column",
+						     P_("Text column"),
+						     P_("Model column used to retrieve the text from"),
+						     -1, G_MAXINT, -1,
+						     G_PARAM_READWRITE));
+
+  
+  /**
+   * MokoIconView:markup-column:
+   *
+   * The ::markup-column property contains the number of the model column
+   * containing markup information to be displayed. The markup column must be 
+   * of type #G_TYPE_STRING. If this property and the :text-column property 
+   * are both set to column numbers, it overrides the text column.
+   * If both are set to -1, no texts are displayed.   
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+				   PROP_MARKUP_COLUMN,
+				   g_param_spec_int ("markup_column",
+						     P_("Markup column"),
+						     P_("Model column used to retrieve the text if using Pango markup"),
+						     -1, G_MAXINT, -1,
+						     G_PARAM_READWRITE));
+  
+  g_object_class_install_property (gobject_class,
+                                   PROP_MODEL,
+                                   g_param_spec_object ("model",
+							P_("Icon View Model"),
+							P_("The model for the icon view"),
+							GTK_TYPE_TREE_MODEL,
+							G_PARAM_READWRITE));
+  
+  /**
+   * MokoIconView:columns:
+   *
+   * The columns property contains the number of the columns in which the
+   * items should be displayed. If it is -1, the number of columns will
+   * be chosen automatically to fill the available area.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+				   PROP_COLUMNS,
+				   g_param_spec_int ("columns",
+						     P_("Number of columns"),
+						     P_("Number of columns to display"),
+						     -1, G_MAXINT, -1,
+						     G_PARAM_READWRITE));
+  
+
+  /**
+   * MokoIconView::item-width:
+   *
+   * The item-width property specifies the width to use for each item. 
+   * If it is set to -1, the icon view will automatically determine a 
+   * suitable item size.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+				   PROP_ITEM_WIDTH,
+				   g_param_spec_int ("item_width",
+						     P_("Width for each item"),
+						     P_("The width used for each item"),
+						     -1, G_MAXINT, -1,
+						     G_PARAM_READWRITE));  
+
+  /**
+   * MokoIconView::spacing:
+   *
+   * The spacing property specifies the space which is inserted between
+   * the cells (i.e. the icon and the text) of an item.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_SPACING,
+                                   g_param_spec_int ("spacing",
+						     P_("Spacing"),
+						     P_("Space which is inserted between cells of an item"),
+						     0, G_MAXINT, 0,
+						     G_PARAM_READWRITE));
+
+  /**
+   * MokoIconView::row-spacing:
+   *
+   * The row-spacing property specifies the space which is inserted between
+   * the rows of the icon view.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_ROW_SPACING,
+                                   g_param_spec_int ("row_spacing",
+						     P_("Row Spacing"),
+						     P_("Space which is inserted between grid rows"),
+						     0, G_MAXINT, 6,
+						     G_PARAM_READWRITE));
+
+  /**
+   * MokoIconView::column-spacing:
+   *
+   * The column-spacing property specifies the space which is inserted between
+   * the columns of the icon view.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_COLUMN_SPACING,
+                                   g_param_spec_int ("column_spacing",
+						     P_("Column Spacing"),
+						     P_("Space which is inserted between grid column"),
+						     0, G_MAXINT, 6,
+						     G_PARAM_READWRITE));
+
+  /**
+   * MokoIconView::margin:
+   *
+   * The margin property specifies the space which is inserted 
+   * at the edges of the icon view.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_MARGIN,
+                                   g_param_spec_int ("margin",
+						     P_("Margin"),
+						     P_("Space which is inserted at the edges of the icon view"),
+						     0, G_MAXINT, 6,
+						     G_PARAM_READWRITE));
+
+
+  /**
+   * MokoIconView::orientation:
+   *
+   * The orientation property specifies how the cells (i.e. the icon and 
+   * the text) of the item are positioned relative to each other.
+   *
+   * Since: 2.6
+   */
+  g_object_class_install_property (gobject_class,
+				   PROP_ORIENTATION,
+				   g_param_spec_enum ("orientation",
+						      P_("Orientation"),
+						      P_("How the text and icon of each item are positioned relative to each other"),
+						      GTK_TYPE_ORIENTATION,
+						      GTK_ORIENTATION_VERTICAL,
+						      G_PARAM_READWRITE));
+
+  /* Style properties */
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_boxed ("selection_box_color",
+                                                               P_("Selection Box Color"),
+                                                               P_("Color of the selection box"),
+                                                               GDK_TYPE_COLOR,
+                                                               G_PARAM_READABLE));
+
+  gtk_widget_class_install_style_property (widget_class,
+                                           g_param_spec_uchar ("selection_box_alpha",
+                                                               P_("Selection Box Alpha"),
+                                                               P_("Opacity of the selection box"),
+                                                               0, 0xff,
+                                                               0x40,
+                                                               G_PARAM_READABLE));
+
+/*signals*/
+    widget_class->set_scroll_adjustments_signal =
+    g_signal_new ("set_scroll_adjustments",
+		  G_TYPE_FROM_CLASS (gobject_class),
+		  G_SIGNAL_RUN_LAST,
+		  G_STRUCT_OFFSET (MokoIconViewClass, set_scroll_adjustments),
+		  NULL, NULL, 
+		  moko_marshal_VOID__OBJECT_OBJECT,
+		  G_TYPE_NONE, 2,
+		  GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+
+    moko_icon_view_signals[MOVE_CURSOR] =
+    g_signal_new ("move_cursor",
+		  G_TYPE_FROM_CLASS (gobject_class),
+		  G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+		  G_STRUCT_OFFSET (MokoIconViewClass, move_cursor),
+		  NULL, NULL,
+		  moko_marshal_BOOLEAN__ENUM_INT,
+		  G_TYPE_BOOLEAN, 2,
+		  GTK_TYPE_MOVEMENT_STEP,
+		  G_TYPE_INT);
     
-   /* icon_view_signals[ICON_VIEW_SIGNAL] = g_signal_new ("MokoIconView",
-            G_TYPE_FROM_CLASS (klass),
-            G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
-            G_STRUCT_OFFSET (MokoIconViewClass, moko_icon_view_function),
-            NULL,
-            NULL,
-            g_cclosure_marshal_VOID__VOID,
-            G_TYPE_NONE, 
-            0);
-            */
+/*Only for test delete later*/
+  moko_icon_view_add_move_binding (binding_set, GDK_Up, 0,
+				  GTK_MOVEMENT_DISPLAY_LINES, -1);
+  moko_icon_view_add_move_binding (binding_set, GDK_KP_Up, 0,
+				  GTK_MOVEMENT_DISPLAY_LINES, -1);
+
+  moko_icon_view_add_move_binding (binding_set, GDK_Down, 0,
+				  GTK_MOVEMENT_DISPLAY_LINES, 1);
+  moko_icon_view_add_move_binding (binding_set, GDK_KP_Down, 0,
+				  GTK_MOVEMENT_DISPLAY_LINES, 1);
+
+  moko_icon_view_add_move_binding (binding_set, GDK_Right, 0, 
+				  GTK_MOVEMENT_VISUAL_POSITIONS, 1);
+  moko_icon_view_add_move_binding (binding_set, GDK_Left, 0, 
+				  GTK_MOVEMENT_VISUAL_POSITIONS, -1);
+
+  moko_icon_view_add_move_binding (binding_set, GDK_KP_Right, 0, 
+				  GTK_MOVEMENT_VISUAL_POSITIONS, 1);
+  moko_icon_view_add_move_binding (binding_set, GDK_KP_Left, 0, 
+				  GTK_MOVEMENT_VISUAL_POSITIONS, -1);
 }
 
 /*@brief initialize 	MokoIconView instance
  *@param mm	MokoIconView*
  *@return none
  */
-void
-moko_icon_view_init(MokoIconView *self)
+static void
+moko_icon_view_init(MokoIconView *icon_view)
 {
-  PangoFontDescription* PangoFont = pango_font_description_new(); //get system default PangoFontDesc
-  if (PangoFont)
-    pango_font_description_free (PangoFont);
-}
+  icon_view->priv = MOKO_ICON_VIEW_GET_PRIVATE (icon_view);
+  
+  icon_view->priv->width = 120;
+  icon_view->priv->height = 120;
+  icon_view->priv->selection_mode = GTK_SELECTION_SINGLE;
+#ifdef DND_WORKS
+  icon_view->priv->pressed_button = -1;
+  icon_view->priv->press_start_x = -1;
+  icon_view->priv->press_start_y = -1;
+#endif
+  icon_view->priv->text_column = -1;
+  icon_view->priv->markup_column = -1;  
+  icon_view->priv->pixbuf_column = -1;
 
+  icon_view->priv->pixbuf_offset_x = 20;
+  icon_view->priv->pixbuf_offset_y = 20;
+  icon_view->priv->layout_offset_x = 0;
+  icon_view->priv->layout_offset_y = 0;
+  icon_view->priv->max_text_len = 10;
+  
+  icon_view->priv->layout = gtk_widget_create_pango_layout (GTK_WIDGET (icon_view), NULL);
 
-/* Construction */
-GtkWidget* 
-moko_icon_view_new()
-{
-  return GTK_WIDGET(g_object_new(moko_icon_view_get_type(), NULL));
+  pango_layout_set_wrap (icon_view->priv->layout, PANGO_WRAP_WORD_CHAR);
+
+  GTK_WIDGET_SET_FLAGS (icon_view, GTK_CAN_FOCUS);
+  
+  moko_icon_view_set_adjustments (icon_view, NULL, NULL);
+
+  icon_view->priv->orientation = GTK_ORIENTATION_VERTICAL;
+
+  icon_view->priv->columns = -1;
+  icon_view->priv->item_width = -1;
+  icon_view->priv->spacing = 0;
+  icon_view->priv->row_spacing = 6;
+  icon_view->priv->column_spacing = 6;
+  icon_view->priv->margin = 6;
 }
 
+
 /* Destruction */
 void 
 moko_icon_view_clear(MokoIconView *self)
@@ -218,7 +823,8 @@
 *
 */
 void
-moko_icon_view_update(GtkListStore *store) {
+moko_icon_view_update(GtkListStore *store) 
+{
     
 }
 
@@ -227,11 +833,11 @@
 static void
 moko_icon_view_realize (GtkWidget *widget)
 {
-  GtkIconView *icon_view;
+  MokoIconView *icon_view;
   GdkWindowAttr attributes;
   gint attributes_mask;
-  
-  icon_view = GTK_ICON_VIEW (widget);
+DEBUG("ICON VIEW REALIZE");
+  icon_view = MOKO_ICON_VIEW (widget);
 
   GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
 
@@ -271,64 +877,56 @@
   gdk_window_set_user_data (icon_view->priv->bin_window, widget);
 
   widget->style = gtk_style_attach (widget->style, widget->window);
-  g_debug ("***************** #########");
- // if (widget->style->bg_pixmap[widget->state])
- //{
-   //gdk_window_set_back_pixmap (icon_view->priv->bin_window, &widget->style->bg_pixmap[widget->state], FALSE);
-   //gdk_window_set_back_pixmap (widget->window, &widget->style->bg_pixmap[widget->state], FALSE);
-   
- //}else{
+  gtk_style_set_background (widget->style, widget->window, widget->state);//SUNZY:draw window backgound with window BG_PIXBUF
+  
    //gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]);
    //gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
- //	}
 
- gtk_style_set_background (widget->style, widget->window, widget->state);
+}
 
- g_debug ("***************** #########");
- sleep (2);
+static void
+moko_icon_view_map (GtkWidget *widget)
+{
+  MokoIconView *icon_view;
+DEBUG("ICON VIEW MAP");
+  icon_view = MOKO_ICON_VIEW (widget);
+
+  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
+
+  gdk_window_show (icon_view->priv->bin_window);
+  gdk_window_show (widget->window);
+  DEBUG("END ICON VIEW MAP");
 }
 
 static void
-gtk_icon_view_update_item_text (GtkIconView     *icon_view,
-				GtkIconViewItem *item)
+moko_icon_view_unrealize (GtkWidget *widget)
 {
-  gboolean iters_persist;
-  GtkTreeIter iter;
-  GtkTreePath *path;
-  gchar *text;
-  
-  iters_persist = gtk_tree_model_get_flags (icon_view->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST;
-  
-  if (!iters_persist)
-    {
-      path = gtk_tree_path_new_from_indices (item->index, -1);
-      gtk_tree_model_get_iter (icon_view->priv->model, &iter, path);
-      gtk_tree_path_free (path);
-    }
-  else
-    iter = item->iter;
+  MokoIconView *icon_view;
+DEBUG("ICON VIEW UNREALIZE");
+  icon_view = MOKO_ICON_VIEW (widget);
 
-  if (icon_view->priv->markup_column != -1)
-    {
-      gtk_tree_model_get (icon_view->priv->model, &iter,
-			  icon_view->priv->markup_column, &text,
-			  -1);
-      pango_layout_set_markup (icon_view->priv->layout, text, -1);
-      g_free (text);        
-    }
-  else if (icon_view->priv->text_column != -1)
-    {
-      gtk_tree_model_get (icon_view->priv->model, &iter,
-			  icon_view->priv->text_column, &text,
-			  -1);
-      pango_layout_set_text (icon_view->priv->layout, text, -1);
-      g_free (text);        
-    }
-  else
-      pango_layout_set_text (icon_view->priv->layout, "", -1);
+  gdk_window_set_user_data (icon_view->priv->bin_window, NULL);
+  gdk_window_destroy (icon_view->priv->bin_window);
+  icon_view->priv->bin_window = NULL;
+
+  /* GtkWidget::unrealize destroys children and widget->window */
+//  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
+    //(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
 }
 
+static void
+moko_icon_view_size_request (GtkWidget      *widget,
+			    GtkRequisition *requisition)
+{
+  MokoIconView *icon_view;
+DEBUG("ICON VIEW SIZE REQUEST");
+  icon_view = MOKO_ICON_VIEW (widget);
 
+  requisition->width = icon_view->priv->width;
+  requisition->height = icon_view->priv->height;
+}
+
+
 static GdkPixbuf *
 create_colorized_pixbuf (GdkPixbuf *src, GdkColor *new_color)
 {
@@ -375,44 +973,60 @@
 }
 
 static GdkPixbuf *
-gtk_icon_view_get_item_icon (GtkIconView      *icon_view,
-			     GtkIconViewItem  *item)
+moko_composite_selected_pixbuf (GdkPixbuf *src, GdkPixbuf *decoration)
 {
-  gboolean iters_persist;
-  GtkTreeIter iter;
-  GtkTreePath *path;
-  GdkPixbuf *pixbuf;
-  
-  g_return_val_if_fail (item != NULL, NULL);
+  int dest_x, dest_y, width, height;
+  double offset_x, offset_y, scale_x, scale_y;
+  gint alpha;
+  GdkPixbuf *dest;
 
-  iters_persist = gtk_tree_model_get_flags (icon_view->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST;
+  dest_x = 0;
+  dest_y = 0;
+  width = gdk_pixbuf_get_width (src);
+  height = gdk_pixbuf_get_height (src);
+  offset_x = 0;
+  offset_y = 0;
+  scale_x = width;
+  scale_y = height;
+  alpha = gdk_pixbuf_get_has_alpha (src);
   
-  if (!iters_persist)
-    {
-      path = gtk_tree_path_new_from_indices (item->index, -1);
-      gtk_tree_model_get_iter (icon_view->priv->model, &iter, path);
-      gtk_tree_path_free (path);
-    }
-  else
-    iter = item->iter;
-  
-  gtk_tree_model_get (icon_view->priv->model, &iter,
-		      icon_view->priv->pixbuf_column, &pixbuf,
-		      -1);
-
-  return pixbuf;
+  g_debug ("test1---------------------");
+  g_debug ("width = %d, height = %d", width, height);
+  /*gdk_pixbuf_copy_area (src,
+                                     0, 0, width, height,
+                                     dest, 0, 0);
+ */
+  g_debug ("test2---------------------");
+  gdk_pixbuf_composite (decoration, src,
+                                   dest_x, dest_y, 
+                                   width, height,
+                                   offset_x, offset_y,
+                                   scale_x, scale_y,
+                                   GDK_INTERP_NEAREST,
+                                   alpha);
+    g_debug ("test3---------------------");
+  return src;
 }
 
 static void
-gtk_icon_view_paint_item (GtkIconView     *icon_view,
-			  GtkIconViewItem *item,
+moko_icon_view_paint_item (MokoIconView     *icon_view,
+			  MokoIconViewItem *item,
 			  GdkRectangle    *area)
 {
   gint focus_width, focus_pad;
-  GdkPixbuf *pixbuf, *tmp, *bg_pixbuf;
+  GdkPixbuf *pixbuf, *tmp;
   GtkStateType state;
   gboolean rtl = gtk_widget_get_direction (GTK_WIDGET (icon_view)) == GTK_TEXT_DIR_RTL;
 
+  if (!icon_view->priv->decoration)
+  {
+    GdkPixbuf *tmp = gdk_pixbuf_new_from_file (PKGDATADIR"/main_menu_sel_icon.png", NULL);
+    icon_view->priv->decoration = gdk_pixbuf_scale_simple (tmp, 
+    	(item->width+2*FRAME_OFFSET), (item->height+2*FRAME_OFFSET), GDK_INTERP_NEAREST);
+    g_object_unref (tmp);
+  }
+g_debug (":)  begin-----------------");
+
   if (!VALID_MODEL_AND_COLUMNS (icon_view))
     return;
   
@@ -428,12 +1042,21 @@
 
   if (icon_view->priv->pixbuf_column != -1)
     {
-      tmp = gtk_icon_view_get_item_icon (icon_view, item);
+      tmp = moko_icon_view_get_item_icon (icon_view, item);
       if (item->selected)
 	{
-	  pixbuf = create_colorized_pixbuf (tmp,
-					    &GTK_WIDGET (icon_view)->style->base[state]);
-	  g_object_unref (tmp);
+	  //pixbuf = create_colorized_pixbuf (tmp,
+		//			    &GTK_WIDGET (icon_view)->style->base[state]);
+	  //pixbuf = moko_composite_selected_pixbuf (tmp, frame);
+	  //g_object_unref (tmp);
+	  //g_debug ("pixbuf_width = %d, pixbufheight = %d", item->pixbuf_width, item->pixbuf_height);
+	  //g_debug ("pixbuf_x = %d, pixbuf_y = %d", item->pixbuf_x, item->pixbuf_y);
+	  gdk_draw_pixbuf (icon_view->priv->bin_window, NULL, icon_view->priv->decoration,
+		       0, 0,
+		       (item->x-FRAME_OFFSET), (item->y-FRAME_OFFSET),
+		       (item->width+2*FRAME_OFFSET), (item->height+2*FRAME_OFFSET),
+		       GDK_RGB_DITHER_NORMAL,
+		       (item->width+2*FRAME_OFFSET), (item->height+2*FRAME_OFFSET));
 	}
       else
 	pixbuf = tmp;
@@ -445,41 +1068,26 @@
 		       GDK_RGB_DITHER_NORMAL,
 		       item->pixbuf_width, item->pixbuf_height);
 
-	/*	       
-	//pixbuf = gdk_pixbuf_get_from_drawable	   
-	gdk_pixbuf_render_to_drawable_alpha (pixbuf,
-                                             GdkDrawable *drawable,
-                                             int src_x,
-                                             int src_y,
-                                             int dest_x,
-                                             int dest_y,
-                                             int width,
-                                             int height,
-                                             GdkPixbufAlphaMode alpha_mode,
-                                             int alpha_threshold,
-                                             GdkRgbDither dither,
-                                             int x_dither,
-                                             int y_dither);
-                                             
-      g_object_unref (pixbuf);
-      */
     }
+g_debug (":) 1 -----------------");
 
   if (icon_view->priv->text_column != -1 ||
       icon_view->priv->markup_column != -1)
     {
       if (item->selected)
 	{
-	  gdk_draw_rectangle (icon_view->priv->bin_window,
+	 /* gdk_draw_rectangle (icon_view->priv->bin_window,
 			      GTK_WIDGET (icon_view)->style->base_gc[state],
 			      TRUE,
 			      item->layout_x - ICON_TEXT_PADDING,
 			      item->layout_y - ICON_TEXT_PADDING,
 			      item->layout_width + 2 * ICON_TEXT_PADDING,
 			      item->layout_height + 2 * ICON_TEXT_PADDING);
+			      */
+	g_debug ("draw pango layout");
 	}
 
-      gtk_icon_view_update_item_text (icon_view, item);
+      moko_icon_view_update_item_text (icon_view, item);
       pango_layout_set_alignment (icon_view->priv->layout, rtl ? PANGO_ALIGN_RIGHT: PANGO_ALIGN_LEFT);
       pango_layout_set_width (icon_view->priv->layout, item->layout_width * PANGO_SCALE);
       gtk_paint_layout (GTK_WIDGET (icon_view)->style,
@@ -504,34 +1112,92 @@
 			 item->layout_height + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad));
 			 
     }
+
 }
 
+static guint32
+moko_gdk_color_to_rgb (const GdkColor *color)
+{
+  guint32 result;
+  result = (0xff0000 | (color->red & 0xff00));
+  result <<= 8;
+  result |= ((color->green & 0xff00) | (color->blue >> 8));
+  return result;
+}
+
+static void
+moko_icon_view_paint_rubberband (MokoIconView     *icon_view,
+				GdkRectangle    *area)
+{
+  GdkRectangle rect;
+  GdkPixbuf *pixbuf;
+  GdkGC *gc;
+  GdkRectangle rubber_rect;
+  GdkColor *fill_color_gdk;
+  guint fill_color;
+  guchar fill_color_alpha;
+
+  rubber_rect.x = MOKO_MAX (icon_view->priv->rubberband_x1, icon_view->priv->rubberband_x2);
+  rubber_rect.y = MOKO_MAX (icon_view->priv->rubberband_y1, icon_view->priv->rubberband_y2);
+  rubber_rect.width = ABS (icon_view->priv->rubberband_x1 - icon_view->priv->rubberband_x2) + 1;
+  rubber_rect.height = ABS (icon_view->priv->rubberband_y1 - icon_view->priv->rubberband_y2) + 1;
+
+  if (!gdk_rectangle_intersect (&rubber_rect, area, &rect))
+    return;
+
+  gtk_widget_style_get (GTK_WIDGET (icon_view),
+                        "selection_box_color", &fill_color_gdk,
+                        "selection_box_alpha", &fill_color_alpha,
+                        NULL);
+
+  if (!fill_color_gdk) {
+    fill_color_gdk = gdk_color_copy (&GTK_WIDGET (icon_view)->style->base[GTK_STATE_SELECTED]);
+  }
+
+  fill_color = moko_gdk_color_to_rgb (fill_color_gdk) << 8 | fill_color_alpha;
+
+  if (!gdk_draw_rectangle_alpha_libgtk_only (icon_view->priv->bin_window,
+					     rect.x, rect.y, rect.width, rect.height,
+					     fill_color_gdk,
+					     fill_color_alpha << 8 | fill_color_alpha))
+    {
+      pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, rect.width, rect.height);
+      gdk_pixbuf_fill (pixbuf, fill_color);
+      
+      gdk_draw_pixbuf (icon_view->priv->bin_window, NULL, pixbuf,
+		       0, 0, 
+		       rect.x,rect.y,
+		       rect.width, rect.height,
+		       GDK_RGB_DITHER_NONE,
+		       0, 0);
+      g_object_unref (pixbuf);
+    }
+
+  gc = gdk_gc_new (icon_view->priv->bin_window);
+  gdk_gc_set_rgb_fg_color (gc, fill_color_gdk);
+  gdk_gc_set_clip_rectangle (gc, &rect);
+  gdk_draw_rectangle (icon_view->priv->bin_window,
+		      gc, FALSE,
+		      rubber_rect.x, rubber_rect.y,
+		      rubber_rect.width - 1, rubber_rect.height - 1);
+  gdk_color_free (fill_color_gdk);
+  g_object_unref (gc);
+}
+
 static gboolean
 moko_icon_view_expose (GtkWidget *widget,
 		      GdkEventExpose *expose)
 {
-  GtkIconView *icon_view;
+  MokoIconView *icon_view;
   GList *icons;
+g_debug ("Call moko icon view expose event callback :)  -----------------");
+  icon_view = MOKO_ICON_VIEW (widget);
 
-    /*GError* err = NULL;
-    GdkPixbuf *pixbuf;
-    GtkStyle *style;    
-    GdkPixmap *pixmap;
-    GdkBitmap *bitmap;
-    pixbuf = gdk_pixbuf_new_from_file ( PKGDATADIR"/bg_mainmenu.png", &err );
-    gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, NULL);
-*/
-  icon_view = GTK_ICON_VIEW (widget);
-
-  //gdk_window_set_back_pixmap (icon_view->priv->bin_window, widget->style->bg_pixmap[widget->state], FALSE);
-
-  //widget->style = gtk_style_attach (widget->style, widget->window);
-
   if (expose->window != icon_view->priv->bin_window)
     return FALSE;
 
   for (icons = icon_view->priv->items; icons; icons = icons->next) {
-    GtkIconViewItem *item = icons->data;
+    MokoIconViewItem *item = icons->data;
     GdkRectangle item_rectangle;
 
     item_rectangle.x = item->x;
@@ -542,11 +1208,27 @@
     if (gdk_region_rect_in (expose->region, &item_rectangle) == GDK_OVERLAP_RECTANGLE_OUT)
       continue;
 
-    gtk_icon_view_paint_item (icon_view, item, &expose->area);
+#ifdef DEBUG_ICON_VIEW
+    gdk_draw_rectangle (icon_view->priv->bin_window,
+			GTK_WIDGET (icon_view)->style->black_gc,
+			FALSE,
+			item->x, item->y, 
+			item->width, item->height);
+    gdk_draw_rectangle (icon_view->priv->bin_window,
+			GTK_WIDGET (icon_view)->style->black_gc,
+			FALSE,
+			item->pixbuf_x, item->pixbuf_y, 
+			item->pixbuf_width, item->pixbuf_height);
+    gdk_draw_rectangle (icon_view->priv->bin_window,
+			GTK_WIDGET (icon_view)->style->black_gc,
+			FALSE,
+			item->layout_x, item->layout_y, 
+			item->layout_width, item->layout_height);
+#endif
+    moko_icon_view_paint_item (icon_view, item, &expose->area);
 
   }
-
- /* if (icon_view->priv->doing_rubberband)
+  if (icon_view->priv->doing_rubberband)
     {
       GdkRectangle *rectangles;
       gint n_rectangles;
@@ -556,17 +1238,581 @@
 				 &n_rectangles);
       
       while (n_rectangles--)
-	gtk_icon_view_paint_rubberband (icon_view, &rectangles[n_rectangles]);
+	moko_icon_view_paint_rubberband (icon_view, &rectangles[n_rectangles]);
 
       g_free (rectangles);
     }
-*/
+
   return TRUE;
 }
 
+static gboolean
+scroll_timeout (gpointer data)
+{
+  MokoIconView *icon_view;
+  gdouble value;
+
+  GDK_THREADS_ENTER ();
+  
+  icon_view = data;
+
+  value = MIN (icon_view->priv->vadjustment->value +
+	       icon_view->priv->scroll_value_diff,
+	       icon_view->priv->vadjustment->upper -
+	       icon_view->priv->vadjustment->page_size);
+
+  gtk_adjustment_set_value (icon_view->priv->vadjustment,
+			    value);
+
+  moko_icon_view_update_rubberband (icon_view);
+  
+  GDK_THREADS_LEAVE ();
+
+  return TRUE;
+}
+
+static gboolean
+moko_icon_view_motion (GtkWidget      *widget,
+		      GdkEventMotion *event)
+{
+  MokoIconView *icon_view;
+  gint abs_y;
+DEBUG("ICON VIEW MOTION");
+  icon_view = MOKO_ICON_VIEW (widget);
+#ifdef DND_WORKS
+  moko_icon_view_maybe_begin_dragging_items (icon_view, event);
+#endif
+  if (icon_view->priv->doing_rubberband)
+    {
+      moko_icon_view_update_rubberband (widget);
+      
+      abs_y = event->y - icon_view->priv->height *
+	(icon_view->priv->vadjustment->value /
+	 (icon_view->priv->vadjustment->upper -
+	  icon_view->priv->vadjustment->lower));
+
+      if (abs_y < 0 || abs_y > widget->allocation.height)
+	{
+	  if (icon_view->priv->scroll_timeout_id == 0)
+	    icon_view->priv->scroll_timeout_id = g_timeout_add (30, scroll_timeout, icon_view);
+
+	  if (abs_y < 0)
+	    icon_view->priv->scroll_value_diff = abs_y;
+	  else
+	    icon_view->priv->scroll_value_diff = abs_y - widget->allocation.height;
+
+	  icon_view->priv->event_last_x = event->x;
+	  icon_view->priv->event_last_y = event->y;
+	}
+      else if (icon_view->priv->scroll_timeout_id != 0)
+	{
+	  g_source_remove (icon_view->priv->scroll_timeout_id);
+
+	  icon_view->priv->scroll_timeout_id = 0;
+	}
+    }
+  
+  return TRUE;
+}
+
+static gboolean
+moko_icon_view_button_press (GtkWidget      *widget,
+			    GdkEventButton *event)
+{
+  MokoIconView *icon_view;
+  MokoIconViewItem *item;
+  gboolean dirty = FALSE;
+DEBUG("ICON VIEW BUTTON PRESS");
+  icon_view = MOKO_ICON_VIEW (widget);
+
+  if (event->window != icon_view->priv->bin_window)
+    return FALSE;
+
+  if (!GTK_WIDGET_HAS_FOCUS (widget))
+    gtk_widget_grab_focus (widget);
+
+  if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
+    {
+
+      item = moko_icon_view_get_item_at_pos (icon_view,
+					    event->x, event->y);
+      
+      if (item != NULL)
+	{
+	  moko_icon_view_scroll_to_item (icon_view, item);
+	  
+	  if (icon_view->priv->selection_mode == GTK_SELECTION_NONE)
+	    {
+	      moko_icon_view_set_cursor_item (icon_view, item);
+	    }
+	  else if (icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE &&
+		   (event->state & GDK_SHIFT_MASK))
+	    {
+	      moko_icon_view_unselect_all_internal (icon_view);
+
+	      moko_icon_view_set_cursor_item (icon_view, item);
+	      if (!icon_view->priv->anchor_item)
+		icon_view->priv->anchor_item = item;
+	      else 
+		moko_icon_view_select_all_between (icon_view,
+						  icon_view->priv->anchor_item,
+						  item);
+	      dirty = TRUE;
+	    }
+	  else 
+	    {
+	      if ((icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE ||
+		  ((icon_view->priv->selection_mode == GTK_SELECTION_SINGLE) && item->selected)) &&
+		  (event->state & GDK_CONTROL_MASK))
+		{
+		  item->selected = !item->selected;
+		  moko_icon_view_queue_draw_item (icon_view, item);
+		  dirty = TRUE;
+		}
+	      else
+		{
+		  if (!item->selected)
+		    {
+		      moko_icon_view_unselect_all_internal (icon_view);
+		      
+		      item->selected = TRUE;
+		      moko_icon_view_queue_draw_item (icon_view, item);
+		      dirty = TRUE;
+		    }
+		}
+	      moko_icon_view_set_cursor_item (icon_view, item);
+	      icon_view->priv->anchor_item = item;
+	    }
+#ifdef DND_WORKS
+	  /* Save press to possibly begin a drag */
+	  if (icon_view->priv->pressed_button < 0)
+	    {
+	      icon_view->priv->pressed_button = event->button;
+	      icon_view->priv->press_start_x = event->x;
+	      icon_view->priv->press_start_y = event->y;
+	    }
+#endif
+	  if (!icon_view->priv->last_single_clicked)
+	    icon_view->priv->last_single_clicked = item;
+	}
+      else
+	{
+	  if (icon_view->priv->selection_mode != GTK_SELECTION_BROWSE &&
+	      !(event->state & GDK_CONTROL_MASK))
+	    {
+	      dirty = moko_icon_view_unselect_all_internal (icon_view);
+	    }
+	  
+	  if (icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE)
+	    moko_icon_view_start_rubberbanding (icon_view, event->x, event->y);
+	}
+
+    }
+
+  if (event->button == 1 && event->type == GDK_2BUTTON_PRESS)
+    {
+      item = moko_icon_view_get_item_at_pos (icon_view,
+					    event->x, event->y);
+
+      if (item && item == icon_view->priv->last_single_clicked)
+	{
+	  GtkTreePath *path;
+
+	  path = gtk_tree_path_new_from_indices (item->index, -1);
+	  moko_icon_view_item_activated (icon_view, path);
+	  gtk_tree_path_free (path);
+	}
+
+      icon_view->priv->last_single_clicked = NULL;
+    }
+  
+  if (dirty)
+    g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
+
+  return event->button == 1;
+}
+
+static gboolean
+moko_icon_view_button_release (GtkWidget      *widget,
+			      GdkEventButton *event)
+{
+  MokoIconView *icon_view;
+DEBUG("ICON VIEW BUTTON RELEASE");
+  icon_view = MOKO_ICON_VIEW (widget);
+  
+#ifdef DND_WORKS
+  if (icon_view->priv->pressed_button == event->button)
+    icon_view->priv->pressed_button = -1;
+#endif
+  moko_icon_view_stop_rubberbanding (icon_view);
+
+  if (icon_view->priv->scroll_timeout_id != 0)
+    {
+      g_source_remove (icon_view->priv->scroll_timeout_id);
+      icon_view->priv->scroll_timeout_id = 0;
+    }
+
+  return TRUE;
+}
+
 static void
-gtk_icon_view_calculate_item_size (GtkIconView     *icon_view,
-				   GtkIconViewItem *item,
+moko_icon_view_update_rubberband (gpointer data)
+{
+  MokoIconView *icon_view;
+  gint x, y;
+  GdkRectangle old_area;
+  GdkRectangle new_area;
+  GdkRectangle common;
+  GdkRegion *invalid_region;
+  
+  icon_view = MOKO_ICON_VIEW (data);
+
+  gdk_window_get_pointer (icon_view->priv->bin_window, &x, &y, NULL);
+
+  x = MOKO_MAX (x, 0);
+  y = MOKO_MAX (y, 0);
+
+  old_area.x = MOKO_MIN (icon_view->priv->rubberband_x1,
+		    icon_view->priv->rubberband_x2);
+  old_area.y = MOKO_MIN (icon_view->priv->rubberband_y1,
+		    icon_view->priv->rubberband_y2);
+  old_area.width = ABS (icon_view->priv->rubberband_x2 -
+			icon_view->priv->rubberband_x1) + 1;
+  old_area.height = ABS (icon_view->priv->rubberband_y2 -
+			 icon_view->priv->rubberband_y1) + 1;
+  
+  new_area.x = MOKO_MIN (icon_view->priv->rubberband_x1, x);
+  new_area.y = MOKO_MIN (icon_view->priv->rubberband_y1, y);
+  new_area.width = ABS (x - icon_view->priv->rubberband_x1) + 1;
+  new_area.height = ABS (y - icon_view->priv->rubberband_y1) + 1;
+
+  invalid_region = gdk_region_rectangle (&old_area);
+  gdk_region_union_with_rect (invalid_region, &new_area);
+
+  gdk_rectangle_intersect (&old_area, &new_area, &common);
+  if (common.width > 2 && common.height > 2)
+    {
+      GdkRegion *common_region;
+
+      /* make sure the border is invalidated */
+      common.x += 1;
+      common.y += 1;
+      common.width -= 2;
+      common.height -= 2;
+      
+      common_region = gdk_region_rectangle (&common);
+
+      gdk_region_subtract (invalid_region, common_region);
+      gdk_region_destroy (common_region);
+    }
+  
+  gdk_window_invalidate_region (icon_view->priv->bin_window, invalid_region, TRUE);
+    
+  gdk_region_destroy (invalid_region);
+
+  icon_view->priv->rubberband_x2 = x;
+  icon_view->priv->rubberband_y2 = y;  
+
+  moko_icon_view_update_rubberband_selection (icon_view);
+}
+
+static void
+moko_icon_view_start_rubberbanding (MokoIconView  *icon_view,
+				   gint          x,
+				   gint          y)
+{
+  GList *items;
+
+  g_assert (!icon_view->priv->doing_rubberband);
+
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      MokoIconViewItem *item = items->data;
+
+      item->selected_before_rubberbanding = item->selected;
+    }
+  
+  icon_view->priv->rubberband_x1 = x;
+  icon_view->priv->rubberband_y1 = y;
+  icon_view->priv->rubberband_x2 = x;
+  icon_view->priv->rubberband_y2 = y;
+
+  icon_view->priv->doing_rubberband = TRUE;
+
+  gtk_grab_add (GTK_WIDGET (icon_view));
+}
+
+static void
+moko_icon_view_stop_rubberbanding (MokoIconView *icon_view)
+{
+  if (!icon_view->priv->doing_rubberband)
+    return;
+
+  icon_view->priv->doing_rubberband = FALSE;
+
+  gtk_grab_remove (GTK_WIDGET (icon_view));
+  
+  gtk_widget_queue_draw (GTK_WIDGET (icon_view));
+}
+
+static void
+moko_icon_view_update_rubberband_selection (MokoIconView *icon_view)
+{
+  GList *items;
+  gint x, y, width, height;
+  gboolean dirty = FALSE;
+  
+  x = MOKO_MIN (icon_view->priv->rubberband_x1,
+	   icon_view->priv->rubberband_x2);
+  y = MOKO_MIN (icon_view->priv->rubberband_y1,
+	   icon_view->priv->rubberband_y2);
+  width = ABS (icon_view->priv->rubberband_x1 - 
+	       icon_view->priv->rubberband_x2);
+  height = ABS (icon_view->priv->rubberband_y1 - 
+		icon_view->priv->rubberband_y2);
+  
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      MokoIconViewItem *item = items->data;
+      gboolean is_in;
+      gboolean selected;
+      
+      is_in = moko_icon_view_item_hit_test (item, x, y, width, height);
+
+      selected = is_in ^ item->selected_before_rubberbanding;
+
+      if (item->selected != selected)
+	{
+	  item->selected = selected;
+	  dirty = TRUE;
+	  moko_icon_view_queue_draw_item (icon_view, item);
+	}
+    }
+
+  if (dirty)
+    g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+static gboolean
+moko_icon_view_item_hit_test (MokoIconViewItem  *item,
+			     gint              x,
+			     gint              y,
+			     gint              width,
+			     gint              height)
+{
+  /* First try the pixbuf */
+  if (MOKO_MIN (x + width, item->pixbuf_x + item->pixbuf_width) - MAX (x, item->pixbuf_x) > 0 &&
+      MOKO_MIN (y + height, item->pixbuf_y + item->pixbuf_height) - MAX (y, item->pixbuf_y) > 0)
+    return TRUE;
+
+  /* Then try the text */
+  if (MOKO_MIN (x + width, item->layout_x + item->layout_width) - MAX (x, item->layout_x) > 0 &&
+      MOKO_MIN (y + height, item->layout_y + item->layout_height) - MAX (y, item->layout_y) > 0)
+    return TRUE;
+  
+  return FALSE;
+}
+
+#ifdef DND_WORKS
+static gboolean
+moko_icon_view_maybe_begin_dragging_items (MokoIconView     *icon_view,
+					  GdkEventMotion  *event)
+{
+  gboolean retval = FALSE;
+  gint button;
+  if (icon_view->priv->pressed_button < 0)
+    return retval;
+
+  if (!gtk_drag_check_threshold (GTK_WIDGET (icon_view),
+				 icon_view->priv->press_start_x,
+				 icon_view->priv->press_start_y,
+				 event->x, event->y))
+    return retval;
+
+  button = icon_view->priv->pressed_button;
+  icon_view->priv->pressed_button = -1;
+  
+  {
+    static GtkTargetEntry row_targets[] = {
+      { "MOKO_ICON_VIEW_ITEMS", GTK_TARGET_SAME_APP, 0 }
+    };
+    GtkTargetList *target_list;
+    GdkDragContext *context;
+    MokoIconViewItem *item;
+    
+    retval = TRUE;
+    
+    target_list = gtk_target_list_new (row_targets, G_N_ELEMENTS (row_targets));
+
+    context = gtk_drag_begin (GTK_WIDGET (icon_view),
+			      target_list, GDK_ACTION_MOVE,
+			      button,
+			      (GdkEvent *)event);
+
+    item = moko_icon_view_get_item_at_pos (icon_view,
+					  icon_view->priv->press_start_x,
+					  icon_view->priv->press_start_y);
+    g_assert (item != NULL);
+    gtk_drag_set_icon_pixbuf (context, moko_icon_view_get_item_icon (icon_view, item),
+			      event->x - item->x,
+			      event->y - item->y);
+  }
+  
+  return retval;
+}
+#endif
+
+static gboolean
+moko_icon_view_unselect_all_internal (MokoIconView  *icon_view)
+{
+  gboolean dirty = FALSE;
+  GList *items;
+
+  if (icon_view->priv->selection_mode == GTK_SELECTION_NONE)
+    return FALSE;
+
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      MokoIconViewItem *item = items->data;
+
+      if (item->selected)
+	{
+	  item->selected = FALSE;
+	  dirty = TRUE;
+	  moko_icon_view_queue_draw_item (icon_view, item);
+	}
+    }
+
+  return dirty;
+}
+/* MokoIconView signals */
+static void
+moko_icon_view_set_adjustments (MokoIconView   *icon_view,
+			       GtkAdjustment *hadj,
+			       GtkAdjustment *vadj)
+{
+  gboolean need_adjust = FALSE;
+DEBUG("ICON VIEW SET ADJUSTMENTS");
+  if (hadj)
+    g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
+  else
+    hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
+  if (vadj)
+    g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
+  else
+    vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
+
+  if (icon_view->priv->hadjustment && (icon_view->priv->hadjustment != hadj))
+    {
+      g_signal_handlers_disconnect_matched (icon_view->priv->hadjustment, G_SIGNAL_MATCH_DATA,
+					   0, 0, NULL, NULL, icon_view);
+      g_object_unref (icon_view->priv->hadjustment);
+    }
+
+  if (icon_view->priv->vadjustment && (icon_view->priv->vadjustment != vadj))
+    {
+      g_signal_handlers_disconnect_matched (icon_view->priv->vadjustment, G_SIGNAL_MATCH_DATA,
+					    0, 0, NULL, NULL, icon_view);
+      g_object_unref (icon_view->priv->vadjustment);
+    }
+
+  if (icon_view->priv->hadjustment != hadj)
+    {
+      icon_view->priv->hadjustment = hadj;
+      g_object_ref (icon_view->priv->hadjustment);
+      gtk_object_sink (GTK_OBJECT (icon_view->priv->hadjustment));
+
+      g_signal_connect (icon_view->priv->hadjustment, "value_changed",
+			G_CALLBACK (moko_icon_view_adjustment_changed),
+			icon_view);
+      need_adjust = TRUE;
+    }
+
+  if (icon_view->priv->vadjustment != vadj)
+    {
+      icon_view->priv->vadjustment = vadj;
+      g_object_ref (icon_view->priv->vadjustment);
+      gtk_object_sink (GTK_OBJECT (icon_view->priv->vadjustment));
+
+      g_signal_connect (icon_view->priv->vadjustment, "value_changed",
+			G_CALLBACK (moko_icon_view_adjustment_changed),
+			icon_view);
+      need_adjust = TRUE;
+    }
+
+  if (need_adjust)
+    moko_icon_view_adjustment_changed (NULL, icon_view);
+}
+
+static void
+moko_icon_view_real_select_all (MokoIconView *icon_view)
+{
+  moko_icon_view_select_all (icon_view);
+}
+
+static void
+moko_icon_view_real_unselect_all (MokoIconView *icon_view)
+{
+  moko_icon_view_unselect_all (icon_view);
+}
+
+static void
+moko_icon_view_real_select_cursor_item (MokoIconView *icon_view)
+{
+  moko_icon_view_unselect_all (icon_view);
+  
+  if (icon_view->priv->cursor_item != NULL)
+    moko_icon_view_select_item (icon_view, icon_view->priv->cursor_item);
+}
+
+static gboolean
+moko_icon_view_real_activate_cursor_item (MokoIconView *icon_view)
+{
+  GtkTreePath *path;
+  
+  if (!icon_view->priv->cursor_item)
+    return FALSE;
+
+  path = gtk_tree_path_new_from_indices (icon_view->priv->cursor_item->index, -1);
+  
+  moko_icon_view_item_activated (icon_view, path);
+
+  gtk_tree_path_free (path);
+
+  return TRUE;
+}
+
+static void
+moko_icon_view_real_toggle_cursor_item (MokoIconView *icon_view)
+{
+  if (!icon_view->priv->cursor_item)
+    return;
+
+  switch (icon_view->priv->selection_mode)
+    {
+    case GTK_SELECTION_NONE:
+      break;
+    case GTK_SELECTION_BROWSE:
+      moko_icon_view_select_item (icon_view, icon_view->priv->cursor_item);
+      break;
+    case GTK_SELECTION_SINGLE:
+      if (icon_view->priv->cursor_item->selected)
+	moko_icon_view_unselect_item (icon_view, icon_view->priv->cursor_item);
+      else
+	moko_icon_view_select_item (icon_view, icon_view->priv->cursor_item);
+      break;
+    case GTK_SELECTION_MULTIPLE:
+      icon_view->priv->cursor_item->selected = !icon_view->priv->cursor_item->selected;
+      g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0); 
+      
+      moko_icon_view_queue_draw_item (icon_view, icon_view->priv->cursor_item);
+      break;
+    }
+}
+
+static void
+gtk_icon_view_calculate_item_size (MokoIconView     *icon_view,
+				   MokoIconViewItem *item,
 				   gint             item_width)
 {
   gint focus_width, focus_pad;
@@ -588,7 +1834,7 @@
 
   if (icon_view->priv->pixbuf_column != -1)
     {
-      pixbuf = gtk_icon_view_get_item_icon (icon_view, item);
+      pixbuf = moko_icon_view_get_item_icon (icon_view, item);
       item->pixbuf_width = gdk_pixbuf_get_width (pixbuf);
       item->pixbuf_height = gdk_pixbuf_get_height (pixbuf);
       g_object_unref (pixbuf);
@@ -604,15 +1850,15 @@
       item_width > 0)
     {
       colspan = item->pixbuf_width / item_width + 1;
-      maximum_layout_width = MAX (colspan * item_width - item->pixbuf_width - icon_view->priv->spacing - 2 * (ICON_TEXT_PADDING + focus_width + focus_pad), 50);
+      maximum_layout_width = MOKO_MAX (colspan * item_width - item->pixbuf_width - icon_view->priv->spacing - 2 * (ICON_TEXT_PADDING + focus_width + focus_pad), 50);
     }
   else
-    maximum_layout_width = MAX (item_width, item->pixbuf_width);
+    maximum_layout_width = MOKO_MAX (item_width, item->pixbuf_width);
     
   if (icon_view->priv->markup_column != -1 ||
       icon_view->priv->text_column != -1)
     {
-      gtk_icon_view_update_item_text (icon_view, item);
+      moko_icon_view_update_item_text (icon_view, item);
 
       pango_layout_set_alignment (icon_view->priv->layout, PANGO_ALIGN_CENTER);
       pango_layout_set_width (icon_view->priv->layout, maximum_layout_width * PANGO_SCALE);
@@ -635,15 +1881,126 @@
     {
       item->width = item->layout_width + padding + spacing + item->pixbuf_width;
       item->height = MOKO_MAX (item->layout_height + padding, item->pixbuf_height);
+      g_debug ("Hlayout_width = %d, padding = %d, spacing = %d, pixbuf_width = %d",
+      	  			item->layout_width, padding, spacing, item->pixbuf_width);
     }
   else
     {
       item->width = MOKO_MAX (item->layout_width + padding, item->pixbuf_width);
       item->height = item->layout_height + padding + spacing + item->pixbuf_height;
+      g_debug ("Vlayout_width = %d, padding = %d, spacing = %d, pixbuf_width = %d",
+      	  			item->layout_width, padding, spacing, item->pixbuf_width);
     }
 }
+
+static void
+moko_icon_view_calculate_item_size (MokoIconView     *icon_view,
+				   MokoIconViewItem *item,
+				   gint             item_width)
+{
+  gint focus_width, focus_pad;
+  gint layout_width, layout_height;
+  gint maximum_layout_width;
+  gint spacing, padding;
+  gint colspan;
+  GdkPixbuf *pixbuf;
+  
+  if (item->width != -1 && item->height != -1) 
+    return;
+
+  gtk_widget_style_get (GTK_WIDGET (icon_view),
+			"focus-line-width", &focus_width,
+			"focus-padding", &focus_pad,
+			NULL);
+
+  spacing = icon_view->priv->spacing;
+
+  if (icon_view->priv->pixbuf_column != -1)
+    {
+      pixbuf = moko_icon_view_get_item_icon (icon_view, item);
+      item->pixbuf_width = gdk_pixbuf_get_width (pixbuf);
+      item->pixbuf_height = gdk_pixbuf_get_height (pixbuf);
+      g_object_unref (pixbuf);
+    }
+  else
+    {
+      item->pixbuf_width = 0;
+      item->pixbuf_height = 0;
+      spacing = 0;
+    }
+  
+  if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
+      item_width > 0)
+    {
+      colspan = item->pixbuf_width / item_width + 1;
+      maximum_layout_width = MOKO_MAX (colspan * item_width - item->pixbuf_width - icon_view->priv->spacing - 2 * (ICON_TEXT_PADDING + focus_width + focus_pad), 50);
+    }
+  else
+    maximum_layout_width = MOKO_MAX (item_width, item->pixbuf_width);
+    //maximum_layout_width = item_width;
+
+    
+  if (icon_view->priv->markup_column != -1 ||
+      icon_view->priv->text_column != -1)
+    {
+      moko_icon_view_update_item_text (icon_view, item);
+
+      pango_layout_set_alignment (icon_view->priv->layout, PANGO_ALIGN_CENTER);
+      pango_layout_set_width (icon_view->priv->layout, icon_view->priv->width* PANGO_SCALE);//maximum_layout_width * PANGO_SCALE);
+      //pango_layout_iter_set_line_yrange (icon_view->priv->layout, 0, 1);
+      //pango_layout_set_ellipsize (icon_view->priv->layout, PANGO_ELLIPSIZE_END);
+
+      pango_layout_get_pixel_size (icon_view->priv->layout, &layout_width, &layout_height);
+      
+      item->layout_width = layout_width;
+      item->layout_height = layout_height;
+      padding = 2 * (ICON_TEXT_PADDING + focus_width + focus_pad);
+    }
+  else
+    {
+      item->layout_width = 0;
+      item->layout_height = 0;
+      spacing = 0;
+      padding = 0;
+    }
+
+  if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      item->width = item->layout_width + padding + spacing + item->pixbuf_width;
+      item->height = MOKO_MAX (item->layout_height + padding, item->pixbuf_height);
+      g_debug ("Hlayout_width = %d, padding = %d, spacing = %d, pixbuf_width = %d",
+      	  			item->layout_width, padding, spacing, item->pixbuf_width);
+    }
+  else
+    {
+      item->width = MOKO_MAX (item->layout_width + padding, item->pixbuf_width);
+      item->height = item->layout_height + padding + spacing + item->pixbuf_height;
+      g_debug ("Vlayout_width = %d, padding = %d, spacing = %d, pixbuf_width = %d",
+      	  			item->layout_width, padding, spacing, item->pixbuf_width);
+    }
+}
+
+
+/* Internal functions */
+static void
+moko_icon_view_adjustment_changed (GtkAdjustment *adjustment,
+				  MokoIconView   *icon_view)
+{
+  if (GTK_WIDGET_REALIZED (icon_view))
+    {
+      gdk_window_move (icon_view->priv->bin_window,
+		       - icon_view->priv->hadjustment->value,
+		       - icon_view->priv->vadjustment->value);
+
+      if (icon_view->priv->doing_rubberband)
+	moko_icon_view_update_rubberband (GTK_WIDGET (icon_view));
+
+       gdk_window_process_updates (icon_view->priv->bin_window, TRUE);
+    }
+}
+
 static GList *
-gtk_icon_view_layout_single_row (GtkIconView *icon_view, 
+gtk_icon_view_layout_single_row (MokoIconView *icon_view, 
 				 GList       *first_item, 
 				 gint         item_width,
 				 gint         row,
@@ -675,13 +2032,17 @@
 
   while (items)
     {
-      GtkIconViewItem *item = items->data;
+      MokoIconViewItem *item = items->data;
 
-      gtk_icon_view_calculate_item_size (icon_view, item, item_width);
+      moko_icon_view_calculate_item_size (icon_view, item, item_width);
 
       colspan = 1 + (item->width - 1) / (item_width + icon_view->priv->column_spacing);
-      current_width += colspan * (item_width + icon_view->priv->column_spacing);
-	
+      //current_width += colspan * (item_width + icon_view->priv->column_spacing);
+     current_width += item_width + icon_view->priv->column_spacing;
+      
+g_debug ("draw signal row: ");
+g_debug ("colspan:%d, current:%d, item->width:%d, item_width:%d", colspan, current_width, item->width, item_width);
+sleep (1);
       if (items != first_item)
 	{
 	  if ((icon_view->priv->columns <= 0 && current_width > GTK_WIDGET (icon_view)->allocation.width) ||
@@ -689,11 +2050,143 @@
 	    break;
 	}
 
-      item->y = *y;
-      item->x = rtl ? GTK_WIDGET (icon_view)->allocation.width - MAX (item_width, item->width) - x : x;
+      item->y = *y+(icon_view->priv->row_spacing/2);//SUNZY:modify item box y coordinate, originalty value is "y = *y".
+      //item->x = rtl ? GTK_WIDGET (icon_view)->allocation.width - MOKO_MAX (item_width, item->width) - x : x;
+      item->x = x;
+      if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+	{
+	  if (rtl)
+	    {
+	      item->layout_x = item->x + ICON_TEXT_PADDING + focus_width + focus_pad;
+	      if (icon_view->priv->text_column != -1 ||
+		  icon_view->priv->markup_column != -1)
+		item->pixbuf_x = item->x + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad) + icon_view->priv->spacing + item->layout_width;
+	      else
+		item->pixbuf_x = item->x;
+	    }
+	  else 
+	    {
+	      item->pixbuf_x = item->x;
+	      if (icon_view->priv->pixbuf_column != -1)
+		item->layout_x = item->x + item->pixbuf_width + icon_view->priv->spacing + ICON_TEXT_PADDING + focus_width + focus_pad;
+	      else
+		item->layout_x = item->x + ICON_TEXT_PADDING + focus_width + focus_pad;
+	    }
+	}
+      else
+	{
+	  if (item->width < colspan * item_width + (colspan - 1) * icon_view->priv->column_spacing)
+	    item->x += (colspan * item_width + (colspan - 1) * icon_view->priv->column_spacing - item->width) / 2;
 
+	  item->pixbuf_x = item->x + (item->width - item->pixbuf_width) / 2;
+	  item->layout_x = item->x + (item->width - item->layout_width) / 2;
+	}
+
+      x = current_width - icon_view->priv->margin; 
+
+      max_height = MOKO_MAX (max_height, item->height);
+      max_pixbuf_height = MOKO_MAX (max_pixbuf_height, item->pixbuf_height);
+      
+      if (current_width > *maximum_width)
+	*maximum_width = current_width;
+
+      item->row = row;
+      item->col = col;
+
+      col += colspan;
+      items = items->next;
+    }
+
+  last_item = items;
+
+  *y += max_height + icon_view->priv->row_spacing;
+
+  /* Now go through the row again and align the icons */
+  for (items = first_item; items != last_item; items = items->next)
+    {
+      MokoIconViewItem *item = items->data;
+
       if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
 	{
+	  item->pixbuf_y = item->y;
+	  item->layout_y = item->y + ICON_TEXT_PADDING + focus_width + focus_pad;
+	}
+      else 
+	{
+	  item->pixbuf_y = item->y + (max_pixbuf_height - item->pixbuf_height);
+	  if (icon_view->priv->pixbuf_column != -1)
+	    item->layout_y = item->pixbuf_y + item->pixbuf_height + icon_view->priv->spacing + ICON_TEXT_PADDING + focus_width + focus_pad;
+	  else
+	    item->layout_y = item->y + ICON_TEXT_PADDING + focus_width + focus_pad;
+      }
+      /* Update the bounding box */
+      item->y = item->pixbuf_y;
+
+      /* We may want to readjust the new y coordinate. */
+      if (item->y + item->height > *y)
+	*y = item->y + item->height;
+
+      if (rtl)
+	item->col = col - 1 - item->col;
+    }
+  
+  return last_item;
+}
+
+static GList *
+moko_icon_view_layout_single_row (MokoIconView *icon_view, 
+				 GList       *first_item, 
+				 gint         item_width,
+				 gint         row,
+				 gint        *y, 
+				 gint        *maximum_width)
+{
+  gint focus_width, focus_pad;
+  gint x, current_width, max_height, max_pixbuf_height;
+  GList *items, *last_item;
+  gint col;
+  gint colspan;
+  gboolean rtl = gtk_widget_get_direction (GTK_WIDGET (icon_view)) == GTK_TEXT_DIR_RTL;
+
+  x = 0;
+  col = 0;
+  max_height = 0;
+  max_pixbuf_height = 0;
+  items = first_item;
+  current_width = 0;
+
+  gtk_widget_style_get (GTK_WIDGET (icon_view),
+			"focus-line-width", &focus_width,
+			"focus-padding", &focus_pad,
+			NULL);
+
+  x += icon_view->priv->margin;
+  current_width += 2 * icon_view->priv->margin;
+  items = first_item;
+
+  while (items)
+    {
+      MokoIconViewItem *item = items->data;
+
+      moko_icon_view_calculate_item_size (icon_view, item, item_width);
+
+      colspan = 1 + (item->width - 1) / (item_width + icon_view->priv->column_spacing);
+      current_width += colspan * (item_width + icon_view->priv->column_spacing);
+g_debug ("draw signal row: ");
+g_debug ("colspan:%d, current:%d, item->width:%d, item_width:%d, maximum_width:%d", colspan, current_width, item->width, item_width, *maximum_width);
+sleep (1);
+      if (items != first_item)
+      	{
+	  if ((icon_view->priv->columns <= 0 && current_width > GTK_WIDGET (icon_view)->allocation.width) ||
+	      (icon_view->priv->columns > 0 && col >= icon_view->priv->columns))
+	    break;
+	}
+
+      item->y = *y+(icon_view->priv->row_spacing/2);//SUNZY:modify item box y coordinate, originalty value is "y = *y".
+      item->x = rtl ? GTK_WIDGET (icon_view)->allocation.width - MOKO_MAX (item_width, item->width) - x : x;
+
+      if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+	{
 	  if (rtl)
 	    {
 	      item->layout_x = item->x + ICON_TEXT_PADDING + focus_width + focus_pad;
@@ -723,8 +2216,8 @@
 
       x = current_width - icon_view->priv->margin; 
 
-      max_height = MAX (max_height, item->height);
-      max_pixbuf_height = MAX (max_pixbuf_height, item->pixbuf_height);
+      max_height = MOKO_MAX (max_height, item->height);
+      max_pixbuf_height = MOKO_MAX (max_pixbuf_height, item->pixbuf_height);
       
       if (current_width > *maximum_width)
 	*maximum_width = current_width;
@@ -743,7 +2236,7 @@
   /* Now go through the row again and align the icons */
   for (items = first_item; items != last_item; items = items->next)
     {
-      GtkIconViewItem *item = items->data;
+      MokoIconViewItem *item = items->data;
 
       if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
 	{
@@ -771,19 +2264,20 @@
   
   return last_item;
 }
+
 static void
-gtk_icon_view_item_invalidate_size (GtkIconViewItem *item)
+moko_icon_view_item_invalidate_size (MokoIconViewItem *item)
 {
   item->width = -1;
   item->height = -1;
 }
 static void
-gtk_icon_view_set_adjustment_upper (GtkAdjustment *adj,
+moko_icon_view_set_adjustment_upper (GtkAdjustment *adj,
 				    gdouble        upper)
 {
   if (upper != adj->upper)
     {
-      gdouble min = MAX (0.0, upper - adj->page_size);
+      gdouble min = MOKO_MAX (0.0, upper - adj->page_size);
       gboolean value_changed = FALSE;
       
       adj->upper = upper;
@@ -802,7 +2296,7 @@
 }
 
 static void
-gtk_icon_view_layout (GtkIconView *icon_view)
+moko_icon_view_layout (MokoIconView *icon_view)
 {
   gint y = 0, maximum_width = 0;
   GList *icons;
@@ -821,10 +2315,10 @@
     {
       for (icons = icon_view->priv->items; icons; icons = icons->next)
 	{
-	  GtkIconViewItem *item = icons->data;
-	  gtk_icon_view_calculate_item_size (icon_view, item, -1);
-	  item_width = MAX (item_width, item->width);
-	  gtk_icon_view_item_invalidate_size (item);
+	  MokoIconViewItem *item = icons->data;
+	  moko_icon_view_calculate_item_size (icon_view, item, -1);
+	  item_width = MOKO_MAX(item_width, item->width);
+	  moko_icon_view_item_invalidate_size (item);
 	}
     }
 
@@ -834,7 +2328,7 @@
   
   do
     {
-      icons = gtk_icon_view_layout_single_row (icon_view, icons, 
+      icons = moko_icon_view_layout_single_row (icon_view, icons, 
 					       item_width, row,
 					       &y, &maximum_width);
       row++;
@@ -852,14 +2346,14 @@
       icon_view->priv->height = y;
     }
 
-  gtk_icon_view_set_adjustment_upper (icon_view->priv->hadjustment, icon_view->priv->width);
-  gtk_icon_view_set_adjustment_upper (icon_view->priv->vadjustment, icon_view->priv->height);
+  moko_icon_view_set_adjustment_upper (icon_view->priv->hadjustment, icon_view->priv->width);
+  moko_icon_view_set_adjustment_upper (icon_view->priv->vadjustment, icon_view->priv->height);
 
   if (GTK_WIDGET_REALIZED (icon_view))
     {
       gdk_window_resize (icon_view->priv->bin_window,
-			 MAX (icon_view->priv->width, widget->allocation.width),
-			 MAX (icon_view->priv->height, widget->allocation.height));
+			 MOKO_MAX (icon_view->priv->width, widget->allocation.width),
+			 MOKO_MAX (icon_view->priv->height, widget->allocation.height));
     }
 
   if (icon_view->priv->layout_idle_id != 0)
@@ -875,40 +2369,4156 @@
 moko_icon_view_size_allocate (GtkWidget      *widget,
 			     GtkAllocation  *allocation)
 {
-  g_debug ("Call moko icon view size allocate");
-  sleep (2);
-  GtkIconView *icon_view;
+  MokoIconView *icon_view;
+DEBUG("ICON VIEW SIZE ALLOCATE");
+  widget->allocation = *allocation;
 
-  widget->allocation = *allocation;
-  
-  icon_view = GTK_ICON_VIEW (widget);
-  
+  icon_view = MOKO_ICON_VIEW (widget);
+
   if (GTK_WIDGET_REALIZED (widget))
     {
       gdk_window_move_resize (widget->window,
 			      allocation->x, allocation->y,
 			      allocation->width, allocation->height);
       gdk_window_resize (icon_view->priv->bin_window,
-			 MAX (icon_view->priv->width, allocation->width),
-			 MAX (icon_view->priv->height, allocation->height));
+			 MOKO_MAX (icon_view->priv->width, allocation->width),
+			 MOKO_MAX (icon_view->priv->height, allocation->height));
     }
+
+  //SUNZY: REDRAW window back ground wirh widget->bg_pixmap
   gdk_window_set_back_pixmap (icon_view->priv->bin_window, widget->style->bg_pixmap[widget->state], FALSE);
 
   icon_view->priv->hadjustment->page_size = allocation->width;
   icon_view->priv->hadjustment->page_increment = allocation->width * 0.9;
   icon_view->priv->hadjustment->step_increment = allocation->width * 0.1;
   icon_view->priv->hadjustment->lower = 0;
-  icon_view->priv->hadjustment->upper = MAX (allocation->width, icon_view->priv->width);
+  icon_view->priv->hadjustment->upper = MOKO_MAX (allocation->width, icon_view->priv->width);
   gtk_adjustment_changed (icon_view->priv->hadjustment);
 
   icon_view->priv->vadjustment->page_size = allocation->height;
   icon_view->priv->vadjustment->page_increment = allocation->height * 0.9;
   icon_view->priv->vadjustment->step_increment = allocation->width * 0.1;
   icon_view->priv->vadjustment->lower = 0;
-  icon_view->priv->vadjustment->upper = MAX (allocation->height, icon_view->priv->height);
+  icon_view->priv->vadjustment->upper = MOKO_MAX (allocation->height, icon_view->priv->height);
   gtk_adjustment_changed (icon_view->priv->vadjustment);
 
-  gtk_icon_view_layout (icon_view);
+  moko_icon_view_layout (icon_view);
 }
 
+static void
+moko_icon_view_destroy (GtkObject *object)
+{
+  MokoIconView *icon_view;
+DEBUG ("ICON VIEW DESTROY");
+  icon_view = MOKO_ICON_VIEW (object);
+  
+  moko_icon_view_set_model (icon_view, NULL);
+  
+  if (icon_view->priv->layout_idle_id != 0)
+    g_source_remove (icon_view->priv->layout_idle_id);
 
+  if (icon_view->priv->scroll_timeout_id != 0)
+    g_source_remove (icon_view->priv->scroll_timeout_id);
+  
+  (GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+}
+
+static void
+moko_icon_view_finalize (GObject *object)
+{
+  MokoIconView *icon_view;
+DEBUG ("ICON VIEW FINALIZE");
+  icon_view = MOKO_ICON_VIEW (object);
+
+  g_object_unref (icon_view->priv->layout);
+  
+  (G_OBJECT_CLASS (parent_class)->finalize) (object);
+}
+
+static void
+moko_icon_view_set_property (GObject      *object,
+			    guint         prop_id,
+			    const GValue *value,
+			    GParamSpec   *pspec)
+{
+  MokoIconView *icon_view;
+DEBUG("ICON VIEW SET PROPERTY");
+  icon_view = MOKO_ICON_VIEW (object);
+
+  g_debug ("set Moko Icon View Property");
+
+    switch (prop_id)
+    {
+    case PROP_SELECTION_MODE:
+      moko_icon_view_set_selection_mode (icon_view, g_value_get_enum (value));
+      break;
+    case PROP_PIXBUF_COLUMN:
+      moko_icon_view_set_pixbuf_column (icon_view, g_value_get_int (value));
+      break;
+    case PROP_TEXT_COLUMN:
+      moko_icon_view_set_text_column (icon_view, g_value_get_int (value));
+      break;
+    case PROP_MARKUP_COLUMN:
+      moko_icon_view_set_markup_column (icon_view, g_value_get_int (value));
+      break;
+    case PROP_MODEL:
+      moko_icon_view_set_model (icon_view, g_value_get_object (value));
+      break;
+    case PROP_ORIENTATION:
+      moko_icon_view_set_orientation (icon_view, g_value_get_enum (value));
+      break;
+    case PROP_COLUMNS:
+      moko_icon_view_set_columns (icon_view, g_value_get_int (value));
+      break;
+    case PROP_ITEM_WIDTH:
+      moko_icon_view_set_item_width (icon_view, g_value_get_int (value));
+      break;
+    case PROP_SPACING:
+      moko_icon_view_set_spacing (icon_view, g_value_get_int (value));
+      break;
+    case PROP_ROW_SPACING:
+      moko_icon_view_set_row_spacing (icon_view, g_value_get_int (value));
+      break;
+    case PROP_COLUMN_SPACING:
+      moko_icon_view_set_column_spacing (icon_view, g_value_get_int (value));
+      break;
+    case PROP_MARGIN:
+      moko_icon_view_set_margin (icon_view, g_value_get_int (value));
+      break;
+      
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+  
+}
+
+static void
+moko_icon_view_get_property (GObject      *object,
+			    guint         prop_id,
+			    GValue       *value,
+			    GParamSpec   *pspec)
+{
+  MokoIconView *icon_view;
+DEBUG("ICON VIEW GET PROPERTY");
+  icon_view = MOKO_ICON_VIEW (object);
+
+    g_debug ("get Moko Icon View Property");
+    switch (prop_id)
+    {
+    case PROP_SELECTION_MODE:
+      g_value_set_enum (value, icon_view->priv->selection_mode);
+      break;
+    case PROP_PIXBUF_COLUMN:
+      g_value_set_int (value, icon_view->priv->pixbuf_column);
+      break;
+    case PROP_TEXT_COLUMN:
+      g_value_set_int (value, icon_view->priv->text_column);
+      break;
+    case PROP_MARKUP_COLUMN:
+      g_value_set_int (value, icon_view->priv->markup_column);
+      break;
+    case PROP_MODEL:
+      g_value_set_object (value, icon_view->priv->model);
+      break;
+    case PROP_ORIENTATION:
+      g_value_set_enum (value, icon_view->priv->orientation);
+      break;
+    case PROP_COLUMNS:
+      g_value_set_int (value, icon_view->priv->columns);
+      break;
+    case PROP_ITEM_WIDTH:
+      g_value_set_int (value, icon_view->priv->item_width);
+      break;
+    case PROP_SPACING:
+      g_value_set_int (value, icon_view->priv->spacing);
+      break;
+    case PROP_ROW_SPACING:
+      g_value_set_int (value, icon_view->priv->row_spacing);
+      break;
+    case PROP_COLUMN_SPACING:
+      g_value_set_int (value, icon_view->priv->column_spacing);
+      break;
+    case PROP_MARGIN:
+      g_value_set_int (value, icon_view->priv->margin);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+
+}
+
+static void
+moko_icon_view_queue_draw_item (MokoIconView     *icon_view,
+			       MokoIconViewItem *item)
+{
+  GdkRectangle rect;
+
+  rect.x = item->x;
+  rect.y = item->y;
+  rect.width = item->width;
+  rect.height = item->height;
+
+  if (icon_view->priv->bin_window)
+    gdk_window_invalidate_rect (icon_view->priv->bin_window, &rect, TRUE);
+}
+static void
+moko_icon_view_invalidate_sizes (MokoIconView *icon_view)
+{
+  g_list_foreach (icon_view->priv->items,
+		  (GFunc)moko_icon_view_item_invalidate_size, NULL);
+}
+
+static gboolean
+layout_callback (gpointer user_data)
+{
+  MokoIconView *icon_view;
+
+  GDK_THREADS_ENTER ();
+
+  icon_view = MOKO_ICON_VIEW (user_data);
+  
+  icon_view->priv->layout_idle_id = 0;
+
+  moko_icon_view_layout (icon_view);
+  
+  GDK_THREADS_LEAVE();
+
+  return FALSE;
+}
+
+static void
+moko_icon_view_queue_layout (MokoIconView *icon_view)
+{
+  if (icon_view->priv->layout_idle_id != 0)
+    return;
+
+  icon_view->priv->layout_idle_id = g_idle_add (layout_callback, icon_view);
+}
+
+static void
+moko_icon_view_set_cursor_item (MokoIconView     *icon_view,
+			       MokoIconViewItem *item)
+{
+  AtkObject *obj;
+  AtkObject *item_obj;
+
+  if (icon_view->priv->cursor_item == item)
+    return;
+
+  if (icon_view->priv->cursor_item != NULL)
+    moko_icon_view_queue_draw_item (icon_view, icon_view->priv->cursor_item);
+  
+  icon_view->priv->cursor_item = item;
+  moko_icon_view_queue_draw_item (icon_view, item);
+  
+  /* Notify that accessible focus object has changed */
+  obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
+  item_obj = atk_object_ref_accessible_child (obj, item->index);
+
+  if (item_obj != NULL)
+    {
+      atk_focus_tracker_notify (item_obj);
+      g_object_unref (item_obj); 
+    }
+}
+
+
+static MokoIconViewItem *
+moko_icon_view_item_new (void)
+{
+  MokoIconViewItem *item;
+
+  item = g_new0 (MokoIconViewItem, 1);
+
+  item->width = -1;
+  item->height = -1;
+  
+  return item;
+}
+
+static void
+moko_icon_view_item_free (MokoIconViewItem *item)
+{
+  g_return_if_fail (item != NULL);
+
+  g_free (item);
+}
+
+static void
+moko_icon_view_update_item_text (MokoIconView     *icon_view,
+				MokoIconViewItem *item)
+{
+  gboolean iters_persist;
+  GtkTreeIter iter;
+  GtkTreePath *path;
+  gchar *text;
+  
+  iters_persist = gtk_tree_model_get_flags (icon_view->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST;
+  
+  if (!iters_persist)
+    {
+      path = gtk_tree_path_new_from_indices (item->index, -1);
+      gtk_tree_model_get_iter (icon_view->priv->model, &iter, path);
+      gtk_tree_path_free (path);
+    }
+  else
+    iter = item->iter;
+
+  if (icon_view->priv->markup_column != -1)
+    {
+      gtk_tree_model_get (icon_view->priv->model, &iter,
+			  icon_view->priv->markup_column, &text,
+			  -1);
+      pango_layout_set_markup (icon_view->priv->layout, text, -1);
+      g_free (text);        
+    }
+  else if (icon_view->priv->text_column != -1)
+    {
+      gtk_tree_model_get (icon_view->priv->model, &iter,
+			  icon_view->priv->text_column, &text,
+			  -1);
+      if (strlen(text) > icon_view->priv->max_text_len)
+      	{
+      	   char *tmp = text[icon_view->priv->max_text_len-3];
+          g_debug ("%s", tmp);
+          sleep (3);
+          memset (tmp, ".", 3);
+      	   pango_layout_set_text (icon_view->priv->layout, text, icon_view->priv->max_text_len);
+      	}
+      else
+      	   pango_layout_set_text (icon_view->priv->layout, text, -1);
+      g_free (text); 
+      
+    }
+  else
+      pango_layout_set_text (icon_view->priv->layout, "", -1);
+}
+
+static GdkPixbuf *
+moko_icon_view_get_item_icon (MokoIconView      *icon_view,
+			     MokoIconViewItem  *item)
+{
+  gboolean iters_persist;
+  GtkTreeIter iter;
+  GtkTreePath *path;
+  GdkPixbuf *pixbuf;
+  
+  g_return_val_if_fail (item != NULL, NULL);
+
+  iters_persist = gtk_tree_model_get_flags (icon_view->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST;
+  
+  if (!iters_persist)
+    {
+      path = gtk_tree_path_new_from_indices (item->index, -1);
+      gtk_tree_model_get_iter (icon_view->priv->model, &iter, path);
+      gtk_tree_path_free (path);
+    }
+  else
+    iter = item->iter;
+  
+  gtk_tree_model_get (icon_view->priv->model, &iter,
+		      icon_view->priv->pixbuf_column, &pixbuf,
+		      -1);
+
+  return pixbuf;
+}
+
+
+static MokoIconViewItem *
+moko_icon_view_get_item_at_pos (MokoIconView *icon_view,
+			       gint         x,
+			       gint         y)
+{
+  GList *items;
+  
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      MokoIconViewItem *item = items->data;
+      
+      if (x > item->x && x < item->x + item->width &&
+	  y > item->y && y < item->y + item->height)
+	{
+	  /* Check if the mouse is inside the icon or the label */
+	  if ((x > item->pixbuf_x && x < item->pixbuf_x + item->pixbuf_width &&
+	       y > item->pixbuf_y && y < item->pixbuf_y + item->pixbuf_height) ||
+	      (x > item->layout_x - ICON_TEXT_PADDING &&
+	       x < item->layout_x + item->layout_width + ICON_TEXT_PADDING &&
+	       y > item->layout_y - ICON_TEXT_PADDING &&
+	       y < item->layout_y + item->layout_height + ICON_TEXT_PADDING))
+	    return item;
+	}
+    }
+
+  return NULL;
+}
+
+static void
+moko_icon_view_select_item (MokoIconView      *icon_view,
+			   MokoIconViewItem  *item)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (item != NULL);
+
+  if (item->selected)
+    return;
+  
+  if (icon_view->priv->selection_mode == GTK_SELECTION_NONE)
+    return;
+  else if (icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    moko_icon_view_unselect_all_internal (icon_view);
+
+  item->selected = TRUE;
+
+  moko_icon_view_queue_draw_item (icon_view, item);
+
+  g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+
+static void
+moko_icon_view_unselect_item (MokoIconView      *icon_view,
+			     MokoIconViewItem  *item)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (item != NULL);
+
+  if (!item->selected)
+    return;
+  
+  if (icon_view->priv->selection_mode == GTK_SELECTION_NONE ||
+      icon_view->priv->selection_mode == GTK_SELECTION_BROWSE)
+    return;
+  
+  item->selected = FALSE;
+
+  g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
+
+  moko_icon_view_queue_draw_item (icon_view, item);
+}
+
+static void
+verify_items (MokoIconView *icon_view)
+{
+  GList *items;
+  int i = 0;
+
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      MokoIconViewItem *item = items->data;
+
+      if (item->index != i)
+	g_error ("List item does not match its index: item index %d and list index %d\n", item->index, i);
+
+      i++;
+    }
+}
+
+static void
+moko_icon_view_row_changed (GtkTreeModel *model,
+			   GtkTreePath  *path,
+			   GtkTreeIter  *iter,
+			   gpointer      data)
+{
+  MokoIconViewItem *item;
+  gint index;
+  MokoIconView *icon_view;
+
+  icon_view = MOKO_ICON_VIEW (data);
+  
+  index = gtk_tree_path_get_indices(path)[0];
+  item = g_list_nth (icon_view->priv->items, index)->data;
+
+  moko_icon_view_item_invalidate_size (item);
+  moko_icon_view_queue_layout (icon_view);
+
+  verify_items (icon_view);
+}
+
+static void
+moko_icon_view_row_inserted (GtkTreeModel *model,
+			    GtkTreePath  *path,
+			    GtkTreeIter  *iter,
+			    gpointer      data)
+{
+  gint length, index;
+  MokoIconViewItem *item;
+  gboolean iters_persist;
+  MokoIconView *icon_view;
+  GList *list;
+  
+  icon_view = MOKO_ICON_VIEW (data);
+  iters_persist = gtk_tree_model_get_flags (icon_view->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST;
+  
+  length = gtk_tree_model_iter_n_children (model, NULL);
+  index = gtk_tree_path_get_indices(path)[0];
+
+  item = moko_icon_view_item_new ();
+
+  if (iters_persist)
+    item->iter = *iter;
+
+  item->index = index;
+
+  /* FIXME: We can be more efficient here,
+     we can store a tail pointer and use that when
+     appending (which is a rather common operation)
+  */
+  icon_view->priv->items = g_list_insert (icon_view->priv->items,
+					 item, index);
+  
+  list = g_list_nth (icon_view->priv->items, index + 1);
+  for (; list; list = list->next)
+    {
+      item = list->data;
+
+      item->index++;
+    }
+    
+  verify_items (icon_view);
+}
+
+static void
+moko_icon_view_row_deleted (GtkTreeModel *model,
+			   GtkTreePath  *path,
+			   gpointer      data)
+{
+  gint index;
+  MokoIconView *icon_view;
+  MokoIconViewItem *item;
+  GList *list, *next;
+  gboolean emit = FALSE;
+  
+  icon_view = MOKO_ICON_VIEW (data);
+
+  index = gtk_tree_path_get_indices(path)[0];
+
+  list = g_list_nth (icon_view->priv->items, index);
+  item = list->data;
+
+  if (item == icon_view->priv->anchor_item)
+    icon_view->priv->anchor_item = NULL;
+
+  if (item == icon_view->priv->cursor_item)
+    icon_view->priv->cursor_item = NULL;
+
+  if (item->selected)
+    emit = TRUE;
+  
+  moko_icon_view_item_free (item);
+
+  for (next = list->next; next; next = next->next)
+    {
+      item = next->data;
+
+      item->index--;
+    }
+  
+  icon_view->priv->items = g_list_delete_link (icon_view->priv->items, list);
+
+  moko_icon_view_queue_layout (icon_view);
+
+  verify_items (icon_view);  
+  
+  if (emit)
+    g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+static void
+moko_icon_view_rows_reordered (GtkTreeModel *model,
+			      GtkTreePath  *parent,
+			      GtkTreeIter  *iter,
+			      gint         *new_order,
+			      gpointer      data)
+{
+  int i;
+  int length;
+  MokoIconView *icon_view;
+  GList *items = NULL, *list;
+  MokoIconViewItem **item_array;
+  gint *order;
+  
+  icon_view = MOKO_ICON_VIEW (data);
+
+  length = gtk_tree_model_iter_n_children (model, NULL);
+
+  order = g_new (gint, length);
+  for (i = 0; i < length; i++)
+    order [new_order[i]] = i;
+
+  item_array = g_new (MokoIconViewItem *, length);
+  for (i = 0, list = icon_view->priv->items; list != NULL; list = list->next, i++)
+    item_array[order[i]] = list->data;
+  g_free (order);
+
+  for (i = length - 1; i >= 0; i--)
+    {
+      item_array[i]->index = i;
+      items = g_list_prepend (items, item_array[i]);
+    }
+  
+  g_free (item_array);
+  g_list_free (icon_view->priv->items);
+  icon_view->priv->items = items;
+
+  verify_items (icon_view);  
+}
+
+static void
+moko_icon_view_build_items (MokoIconView *icon_view)
+{
+  GtkTreeIter iter;
+  int i;
+  gboolean iters_persist;
+  GList *items = NULL;
+
+  iters_persist = gtk_tree_model_get_flags (icon_view->priv->model) & GTK_TREE_MODEL_ITERS_PERSIST;
+  
+  if (!gtk_tree_model_get_iter_first (icon_view->priv->model,
+				      &iter))
+    return;
+
+  i = 0;
+  
+  do
+    {
+      MokoIconViewItem *item = moko_icon_view_item_new ();
+
+      if (iters_persist)
+	item->iter = iter;
+
+      item->index = i;
+      
+      i++;
+
+      items = g_list_prepend (items, item);
+      
+    } while (gtk_tree_model_iter_next (icon_view->priv->model, &iter));
+
+  icon_view->priv->items = g_list_reverse (items);
+}
+
+static void
+moko_icon_view_add_move_binding (GtkBindingSet  *binding_set,
+				guint           keyval,
+				guint           modmask,
+				GtkMovementStep step,
+				gint            count)
+{
+  
+  gtk_binding_entry_add_signal (binding_set, keyval, modmask,
+                                "move_cursor", 2,
+                                G_TYPE_ENUM, step,
+                                G_TYPE_INT, count);
+
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_SHIFT_MASK,
+                                "move_cursor", 2,
+                                G_TYPE_ENUM, step,
+                                G_TYPE_INT, count);
+
+  if ((modmask & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+   return;
+
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+                                "move_cursor", 2,
+                                G_TYPE_ENUM, step,
+                                G_TYPE_INT, count);
+
+  gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK,
+                                "move_cursor", 2,
+                                G_TYPE_ENUM, step,
+                                G_TYPE_INT, count);
+}
+
+static gboolean
+moko_icon_view_real_move_cursor (MokoIconView     *icon_view,
+				GtkMovementStep  step,
+				gint             count)
+{
+  GdkModifierType state;
+
+  g_return_val_if_fail (MOKO_ICON_VIEW (icon_view), FALSE);
+  g_return_val_if_fail (step == GTK_MOVEMENT_LOGICAL_POSITIONS ||
+			step == GTK_MOVEMENT_VISUAL_POSITIONS ||
+			step == GTK_MOVEMENT_DISPLAY_LINES ||
+			step == GTK_MOVEMENT_PAGES ||
+			step == GTK_MOVEMENT_BUFFER_ENDS, FALSE);
+
+  if (!GTK_WIDGET_HAS_FOCUS (GTK_WIDGET (icon_view)))
+    return FALSE;
+
+  gtk_widget_grab_focus (GTK_WIDGET (icon_view));
+
+  if (gtk_get_current_event_state (&state))
+    {
+      if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
+        icon_view->priv->ctrl_pressed = TRUE;
+      if ((state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK)
+        icon_view->priv->shift_pressed = TRUE;
+    }
+  /* else we assume not pressed */
+
+  switch (step)
+    {
+    case GTK_MOVEMENT_LOGICAL_POSITIONS:
+    case GTK_MOVEMENT_VISUAL_POSITIONS:
+      moko_icon_view_move_cursor_left_right (icon_view, count);
+      break;
+    case GTK_MOVEMENT_DISPLAY_LINES:
+      moko_icon_view_move_cursor_up_down (icon_view, count);
+      break;
+    case GTK_MOVEMENT_PAGES:
+      moko_icon_view_move_cursor_page_up_down (icon_view, count);
+      break;
+    case GTK_MOVEMENT_BUFFER_ENDS:
+      moko_icon_view_move_cursor_start_end (icon_view, count);
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+
+  icon_view->priv->ctrl_pressed = FALSE;
+  icon_view->priv->shift_pressed = FALSE;
+
+  return TRUE;
+}
+
+static MokoIconViewItem *
+find_item (MokoIconView     *icon_view,
+	   MokoIconViewItem *current,
+	   gint             row_ofs,
+	   gint             col_ofs)
+{
+  gint row, col;
+  GList *items;
+  MokoIconViewItem *item;
+
+  /* FIXME: this could be more efficient 
+   */
+  row = current->row + row_ofs;
+  col = current->col + col_ofs;
+
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      item = items->data;
+      if (item->row == row && item->col == col)
+	return item;
+    }
+  
+  return NULL;
+}
+
+
+static MokoIconViewItem *
+find_item_page_up_down (MokoIconView     *icon_view,
+			MokoIconViewItem *current,
+			gint             count)
+{
+  GList *item, *next;
+  gint y, col;
+  
+  col = current->col;
+  y = current->y + count * icon_view->priv->vadjustment->page_size;
+
+  item = g_list_find (icon_view->priv->items, current);
+  if (count > 0)
+    {
+      while (item)
+	{
+	  for (next = item->next; next; next = next->next)
+	    {
+	      if (((MokoIconViewItem *)next->data)->col == col)
+		break;
+	    }
+	  if (!next || ((MokoIconViewItem *)next->data)->y > y)
+	    break;
+
+	  item = next;
+	}
+    }
+  else 
+    {
+      while (item)
+	{
+	  for (next = item->prev; next; next = next->prev)
+	    {
+	      if (((MokoIconViewItem *)next->data)->col == col)
+		break;
+	    }
+	  if (!next || ((MokoIconViewItem *)next->data)->y < y)
+	    break;
+
+	  item = next;
+	}
+    }
+
+  if (item)
+    return item->data;
+
+  return NULL;
+}
+
+static gboolean
+moko_icon_view_select_all_between (MokoIconView     *icon_view,
+				  MokoIconViewItem *anchor,
+				  MokoIconViewItem *cursor)
+{
+  GList *items;
+  MokoIconViewItem *item;
+  gint row1, row2, col1, col2;
+  gboolean dirty = FALSE;
+  
+  if (anchor->row < cursor->row)
+    {
+      row1 = anchor->row;
+      row2 = cursor->row;
+    }
+  else
+    {
+      row1 = cursor->row;
+      row2 = anchor->row;
+    }
+
+  if (anchor->col < cursor->col)
+    {
+      col1 = anchor->col;
+      col2 = cursor->col;
+    }
+  else
+    {
+      col1 = cursor->col;
+      col2 = anchor->col;
+    }
+
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      item = items->data;
+
+      if (row1 <= item->row && item->row <= row2 &&
+	  col1 <= item->col && item->col <= col2)
+	{
+	  if (!item->selected)
+	    dirty = TRUE;
+
+	  item->selected = TRUE;
+	  
+	  moko_icon_view_queue_draw_item (icon_view, item);
+	}
+    }
+
+  return dirty;
+}
+
+static void 
+moko_icon_view_move_cursor_up_down (MokoIconView *icon_view,
+				   gint         count)
+{
+  MokoIconViewItem *item;
+  gboolean dirty = FALSE;
+  
+  if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+    return;
+  
+  if (!icon_view->priv->cursor_item)
+    {
+      GList *list;
+
+      if (count > 0)
+	list = icon_view->priv->items;
+      else
+	list = g_list_last (icon_view->priv->items);
+
+      item = list ? list->data : NULL;
+    }
+  else
+    item = find_item (icon_view, 
+		      icon_view->priv->cursor_item,
+		      count, 0);
+
+  if (!item)
+    return;
+
+  if (icon_view->priv->ctrl_pressed ||
+      !icon_view->priv->shift_pressed ||
+      !icon_view->priv->anchor_item ||
+      icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    icon_view->priv->anchor_item = item;
+
+  moko_icon_view_set_cursor_item (icon_view, item);
+
+  if (!icon_view->priv->ctrl_pressed &&
+      icon_view->priv->selection_mode != GTK_SELECTION_NONE)
+    {
+      moko_icon_view_unselect_all_internal (icon_view);
+      dirty = moko_icon_view_select_all_between (icon_view, 
+						icon_view->priv->anchor_item,
+						item);
+    }
+
+  moko_icon_view_scroll_to_item (icon_view, item);
+
+  if (dirty)
+    g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+static void 
+moko_icon_view_move_cursor_page_up_down (MokoIconView *icon_view,
+					gint         count)
+{
+  MokoIconViewItem *item;
+  gboolean dirty = FALSE;
+  
+  if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+    return;
+  
+  if (!icon_view->priv->cursor_item)
+    {
+      GList *list;
+
+      if (count > 0)
+	list = icon_view->priv->items;
+      else
+	list = g_list_last (icon_view->priv->items);
+
+      item = list ? list->data : NULL;
+    }
+  else
+    item = find_item_page_up_down (icon_view, 
+				   icon_view->priv->cursor_item,
+				   count);
+
+  if (!item)
+    return;
+
+  if (icon_view->priv->ctrl_pressed ||
+      !icon_view->priv->shift_pressed ||
+      !icon_view->priv->anchor_item ||
+      icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    icon_view->priv->anchor_item = item;
+
+  moko_icon_view_set_cursor_item (icon_view, item);
+
+  if (!icon_view->priv->ctrl_pressed &&
+      icon_view->priv->selection_mode != GTK_SELECTION_NONE)
+    {
+      moko_icon_view_unselect_all_internal (icon_view);
+      dirty = moko_icon_view_select_all_between (icon_view, 
+						icon_view->priv->anchor_item,
+						item);
+    }
+
+  moko_icon_view_scroll_to_item (icon_view, item);
+
+  if (dirty)
+    g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);  
+}
+
+static void 
+moko_icon_view_move_cursor_left_right (MokoIconView *icon_view,
+				      gint         count)
+{
+  MokoIconViewItem *item;
+  gboolean dirty = FALSE;
+  
+  if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+    return;
+  
+  if (!icon_view->priv->cursor_item)
+    {
+      GList *list;
+
+      if (count > 0)
+	list = icon_view->priv->items;
+      else
+	list = g_list_last (icon_view->priv->items);
+
+      item = list ? list->data : NULL;
+    }
+  else
+    item = find_item (icon_view, 
+		      icon_view->priv->cursor_item,
+		      0, count);
+
+  if (!item)
+    return;
+
+  if (icon_view->priv->ctrl_pressed ||
+      !icon_view->priv->shift_pressed ||
+      !icon_view->priv->anchor_item ||
+      icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    icon_view->priv->anchor_item = item;
+
+  moko_icon_view_set_cursor_item (icon_view, item);
+
+  if (!icon_view->priv->ctrl_pressed &&
+      icon_view->priv->selection_mode != GTK_SELECTION_NONE)
+    {
+      moko_icon_view_unselect_all_internal (icon_view);
+      dirty = moko_icon_view_select_all_between (icon_view, 
+						icon_view->priv->anchor_item,
+						item);
+    }
+
+  moko_icon_view_scroll_to_item (icon_view, item);
+
+  if (dirty)
+    g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+static void 
+moko_icon_view_move_cursor_start_end (MokoIconView *icon_view,
+				     gint         count)
+{
+  MokoIconViewItem *item;
+  GList *list;
+  gboolean dirty = FALSE;
+  
+  if (!GTK_WIDGET_HAS_FOCUS (icon_view))
+    return;
+  
+  if (count < 0)
+    list = icon_view->priv->items;
+  else
+    list = g_list_last (icon_view->priv->items);
+  
+  item = list ? list->data : NULL;
+
+  if (!item)
+    return;
+
+  if (icon_view->priv->ctrl_pressed ||
+      !icon_view->priv->shift_pressed ||
+      !icon_view->priv->anchor_item ||
+      icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    icon_view->priv->anchor_item = item;
+
+  moko_icon_view_set_cursor_item (icon_view, item);
+
+  if (!icon_view->priv->ctrl_pressed &&
+      icon_view->priv->selection_mode != GTK_SELECTION_NONE)
+    {
+      moko_icon_view_unselect_all (icon_view);
+      dirty = moko_icon_view_select_all_between (icon_view, 
+						icon_view->priv->anchor_item,
+						item);
+    }
+
+  moko_icon_view_scroll_to_item (icon_view, item);
+
+  if (dirty)
+    g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+static void     
+moko_icon_view_scroll_to_item (MokoIconView     *icon_view, 
+			      MokoIconViewItem *item)
+{
+  gint y, height;
+  gdouble value;
+
+  gdk_drawable_get_size (GDK_DRAWABLE (icon_view->priv->bin_window), NULL, &height);
+  gdk_window_get_position (icon_view->priv->bin_window, NULL, &y);
+
+  if (y + item->y < 0)
+    {
+      value = icon_view->priv->vadjustment->value + y + item->y;
+      gtk_adjustment_set_value (icon_view->priv->vadjustment, value);
+    }
+  else if (y + item->y + item->height > GTK_WIDGET (icon_view)->allocation.height)
+    {
+      value = icon_view->priv->vadjustment->value + y + item->y + item->height 
+	- GTK_WIDGET (icon_view)->allocation.height;
+      gtk_adjustment_set_value (icon_view->priv->vadjustment, value);
+    }
+}
+
+/* Public API */
+
+
+/**
+ * moko_icon_view_new:
+ * 
+ * Creates a new #MokoIconView widget
+ * 
+ * Return value: A newly created #MokoIconView widget
+ *
+ * Since: 2.6
+ **/
+GtkWidget *
+moko_icon_view_new (void)
+{
+  return g_object_new (MOKO_TYPE_ICON_VIEW, NULL);
+}
+
+/**
+ * moko_icon_view_new_with_model:
+ * @model: The model.
+ * 
+ * Creates a new #MokoIconView widget with the model @model.
+ * 
+ * Return value: A newly created #MokoIconView widget.
+ *
+ * Since: 2.6 
+ **/
+GtkWidget *
+moko_icon_view_new_with_model (GtkTreeModel *model)
+{
+  return g_object_new (MOKO_TYPE_ICON_VIEW, "model", model, NULL);
+}
+
+
+/**
+ * moko_icon_view_get_path_at_pos:
+ * @icon_view: A #MokoIconView.
+ * @x: The x position to be identified
+ * @y: The y position to be identified
+ * 
+ * Finds the path at the point (@x, @y), relative to widget coordinates.
+ * 
+ * Return value: The #GtkTreePath corresponding to the icon or %NULL
+ * if no icon exists at that position.
+ *
+ * Since: 2.6 
+ **/
+GtkTreePath *
+moko_icon_view_get_path_at_pos (MokoIconView *icon_view,
+			       gint         x,
+			       gint         y)
+{
+  MokoIconViewItem *item;
+  GtkTreePath *path;
+  
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), NULL);
+
+  item = moko_icon_view_get_item_at_pos (icon_view, x, y);
+
+  if (!item)
+    return NULL;
+
+  path = gtk_tree_path_new_from_indices (item->index, -1);
+
+  return path;
+}
+
+/**
+ * moko_icon_view_selected_foreach:
+ * @icon_view: A #MokoIconView.
+ * @func: The funcion to call for each selected icon.
+ * @data: User data to pass to the function.
+ * 
+ * Calls a function for each selected icon. Note that the model or
+ * selection cannot be modified from within this function.
+ *
+ * Since: 2.6 
+ **/
+void
+moko_icon_view_selected_foreach (MokoIconView           *icon_view,
+				MokoIconViewForeachFunc func,
+				gpointer               data)
+{
+  GList *list;
+  
+  for (list = icon_view->priv->items; list; list = list->next)
+    {
+      MokoIconViewItem *item = list->data;
+      GtkTreePath *path = gtk_tree_path_new_from_indices (item->index, -1);
+
+      if (item->selected)
+	(* func) (icon_view, path, data);
+
+      gtk_tree_path_free (path);
+    }
+}
+
+/**
+ * moko_icon_view_set_selection_mode:
+ * @icon_view: A #MokoIconView.
+ * @mode: The selection mode
+ * 
+ * Sets the selection mode of the @icon_view.
+ *
+ * Since: 2.6 
+ **/
+void
+moko_icon_view_set_selection_mode (MokoIconView      *icon_view,
+				  GtkSelectionMode  mode)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+
+  if (mode == icon_view->priv->selection_mode)
+    return;
+  
+  if (mode == GTK_SELECTION_NONE ||
+      icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE)
+    moko_icon_view_unselect_all (icon_view);
+  
+  icon_view->priv->selection_mode = mode;
+
+  g_object_notify (G_OBJECT (icon_view), "selection_mode");
+}
+
+/**
+ * moko_icon_view_get_selection_mode:
+ * @icon_view: A #MokoIconView.
+ * 
+ * Gets the selection mode of the @icon_view.
+ *
+ * Return value: the current selection mode
+ *
+ * Since: 2.6 
+ **/
+GtkSelectionMode
+moko_icon_view_get_selection_mode (MokoIconView *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), GTK_SELECTION_SINGLE);
+
+  return icon_view->priv->selection_mode;
+}
+
+/**
+ * moko_icon_view_set_model:
+ * @icon_view: A #MokoIconView.
+ * @model: The model.
+ *
+ * Sets the model for a #MokoIconView.  
+ * If the @icon_view already has a model set, it will remove 
+ * it before setting the new model.  If @model is %NULL, then
+ * it will unset the old model.
+ *
+ * Since: 2.6 
+ **/
+void
+moko_icon_view_set_model (MokoIconView *icon_view,
+			 GtkTreeModel *model)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
+  
+  if (icon_view->priv->model == model)
+    return;
+
+  if (model)
+    {
+      GType column_type;
+      
+      g_return_if_fail (gtk_tree_model_get_flags (model) & GTK_TREE_MODEL_LIST_ONLY);
+
+      if (icon_view->priv->pixbuf_column != -1)
+	{
+	  column_type = gtk_tree_model_get_column_type (model,
+							icon_view->priv->pixbuf_column);	  
+
+	  g_return_if_fail (column_type == GDK_TYPE_PIXBUF);
+	}
+
+      if (icon_view->priv->text_column != -1)
+	{
+	  column_type = gtk_tree_model_get_column_type (model,
+							icon_view->priv->text_column);	  
+
+	  g_return_if_fail (column_type == G_TYPE_STRING);
+	}
+
+      if (icon_view->priv->markup_column != -1)
+	{
+	  column_type = gtk_tree_model_get_column_type (model,
+							icon_view->priv->markup_column);	  
+
+	  g_return_if_fail (column_type == G_TYPE_STRING);
+	}
+      
+    }
+  
+  if (icon_view->priv->model)
+    {
+      g_signal_handlers_disconnect_by_func (icon_view->priv->model,
+					    moko_icon_view_row_changed,
+					    icon_view);
+      g_signal_handlers_disconnect_by_func (icon_view->priv->model,
+					    moko_icon_view_row_inserted,
+					    icon_view);
+      g_signal_handlers_disconnect_by_func (icon_view->priv->model,
+					    moko_icon_view_row_deleted,
+					    icon_view);
+      g_signal_handlers_disconnect_by_func (icon_view->priv->model,
+					    moko_icon_view_rows_reordered,
+					    icon_view);
+
+      g_object_unref (icon_view->priv->model);
+      
+      g_list_foreach (icon_view->priv->items, (GFunc)moko_icon_view_item_free, NULL);
+      g_list_free (icon_view->priv->items);
+      icon_view->priv->items = NULL;
+      icon_view->priv->anchor_item = NULL;
+      icon_view->priv->cursor_item = NULL;
+      icon_view->priv->last_single_clicked = NULL;
+    }
+
+  icon_view->priv->model = model;
+
+  if (icon_view->priv->model)
+    {
+      g_object_ref (icon_view->priv->model);
+      g_signal_connect (icon_view->priv->model,
+			"row_changed",
+			G_CALLBACK (moko_icon_view_row_changed),
+			icon_view);
+      g_signal_connect (icon_view->priv->model,
+			"row_inserted",
+			G_CALLBACK (moko_icon_view_row_inserted),
+			icon_view);
+      g_signal_connect (icon_view->priv->model,
+			"row_deleted",
+			G_CALLBACK (moko_icon_view_row_deleted),
+			icon_view);
+      g_signal_connect (icon_view->priv->model,
+			"rows_reordered",
+			G_CALLBACK (moko_icon_view_rows_reordered),
+			icon_view);
+
+      moko_icon_view_build_items (icon_view);
+    }
+
+  moko_icon_view_queue_layout (icon_view);
+
+  g_object_notify (G_OBJECT (icon_view), "model");  
+}
+
+/**
+ * moko_icon_view_get_model:
+ * @icon_view: a #MokoIconView
+ *
+ * Returns the model the #MokoIconView is based on.  Returns %NULL if the
+ * model is unset.
+ *
+ * Return value: A #GtkTreeModel, or %NULL if none is currently being used.
+ *
+ * Since: 2.6 
+ **/
+GtkTreeModel *
+moko_icon_view_get_model (MokoIconView *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), NULL);
+
+  return icon_view->priv->model;
+}
+
+/**
+ * moko_icon_view_set_text_column:
+ * @icon_view: A #MokoIconView.
+ * @column: A column in the currently used model.
+ * 
+ * Sets the column with text for @icon_view to be @column. The text
+ * column must be of type #G_TYPE_STRING.
+ *
+ * Since: 2.6 
+ **/
+void
+moko_icon_view_set_text_column (MokoIconView *icon_view,
+			       gint          column)
+{
+  if (column == icon_view->priv->text_column)
+    return;
+  
+  if (column == -1)
+    icon_view->priv->text_column = -1;
+  else
+    {
+      if (icon_view->priv->model != NULL)
+	{
+	  GType column_type;
+	  
+	  column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
+
+	  g_return_if_fail (column_type == G_TYPE_STRING);
+	}
+      
+      icon_view->priv->text_column = column;
+    }
+
+  moko_icon_view_invalidate_sizes (icon_view);
+  moko_icon_view_queue_layout (icon_view);
+  
+  g_object_notify (G_OBJECT (icon_view), "text_column");
+}
+
+/**
+ * moko_icon_view_get_text_column:
+ * @icon_view: A #MokoIconView.
+ *
+ * Returns the column with text for @icon_view.
+ *
+ * Returns: the text column, or -1 if it's unset.
+ *
+ * Since: 2.6
+ */
+gint
+moko_icon_view_get_text_column (MokoIconView  *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->text_column;
+}
+
+/**
+ * moko_icon_view_set_markup_column:
+ * @icon_view: A #MokoIconView.
+ * @column: A column in the currently used model.
+ * 
+ * Sets the column with markup information for @icon_view to be
+ * @column. The markup column must be of type #G_TYPE_STRING.
+ * If the markup column is set to something, it overrides
+ * the text column set by moko_icon_view_set_text_column().
+ *
+ * Since: 2.6
+ **/
+void
+moko_icon_view_set_markup_column (MokoIconView *icon_view,
+				 gint         column)
+{
+  if (column == icon_view->priv->markup_column)
+    return;
+  
+  if (column == -1)
+    icon_view->priv->markup_column = -1;
+  else
+    {
+      if (icon_view->priv->model != NULL)
+	{
+	  GType column_type;
+	  
+	  column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
+
+	  g_return_if_fail (column_type == G_TYPE_STRING);
+	}
+      
+      icon_view->priv->markup_column = column;
+    }
+
+  moko_icon_view_invalidate_sizes (icon_view);
+  moko_icon_view_queue_layout (icon_view);
+  
+  g_object_notify (G_OBJECT (icon_view), "markup_column");
+}
+
+/**
+ * moko_icon_view_get_markup_column:
+ * @icon_view: A #MokoIconView.
+ *
+ * Returns the column with markup text for @icon_view.
+ *
+ * Returns: the markup column, or -1 if it's unset.
+ *
+ * Since: 2.6
+ */
+gint
+moko_icon_view_get_markup_column (MokoIconView  *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->markup_column;
+}
+
+/**
+ * moko_icon_view_set_pixbuf_column:
+ * @icon_view: A #MokoIconView.
+ * @column: A column in the currently used model.
+ * 
+ * Sets the column with pixbufs for @icon_view to be @column. The pixbuf
+ * column must be of type #GDK_TYPE_PIXBUF
+ *
+ * Since: 2.6 
+ **/
+void
+moko_icon_view_set_pixbuf_column (MokoIconView *icon_view,
+				 gint         column)
+{
+  if (column == icon_view->priv->pixbuf_column)
+    return;
+  
+  if (column == -1)
+    icon_view->priv->pixbuf_column = -1;
+  else
+    {
+      if (icon_view->priv->model != NULL)
+	{
+	  GType column_type;
+	  
+	  column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
+
+	  g_return_if_fail (column_type == GDK_TYPE_PIXBUF);
+	}
+      
+      icon_view->priv->pixbuf_column = column;
+    }
+
+  moko_icon_view_invalidate_sizes (icon_view);
+  moko_icon_view_queue_layout (icon_view);
+  
+  g_object_notify (G_OBJECT (icon_view), "pixbuf_column");
+  
+}
+
+/**
+ * moko_icon_view_get_pixbuf_column:
+ * @icon_view: A #MokoIconView.
+ *
+ * Returns the column with pixbufs for @icon_view.
+ *
+ * Returns: the pixbuf column, or -1 if it's unset.
+ *
+ * Since: 2.6
+ */
+gint
+moko_icon_view_get_pixbuf_column (MokoIconView  *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->pixbuf_column;
+}
+
+/**
+ * moko_icon_view_select_path:
+ * @icon_view: A #MokoIconView.
+ * @path: The #GtkTreePath to be selected.
+ * 
+ * Selects the row at @path.
+ *
+ * Since: 2.6
+ **/
+void
+moko_icon_view_select_path (MokoIconView *icon_view,
+			   GtkTreePath *path)
+{
+  MokoIconViewItem *item;
+  
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (icon_view->priv->model != NULL);
+  g_return_if_fail (path != NULL);
+
+  item = g_list_nth (icon_view->priv->items,
+		     gtk_tree_path_get_indices(path)[0])->data;
+
+  if (!item)
+    return;
+  
+  moko_icon_view_select_item (icon_view, item);
+}
+
+/**
+ * moko_icon_view_unselect_path:
+ * @icon_view: A #MokoIconView.
+ * @path: The #GtkTreePath to be unselected.
+ * 
+ * Unselects the row at @path.
+ *
+ * Since: 2.6
+ **/
+void
+moko_icon_view_unselect_path (MokoIconView *icon_view,
+			     GtkTreePath *path)
+{
+  MokoIconViewItem *item;
+  
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (icon_view->priv->model != NULL);
+  g_return_if_fail (path != NULL);
+
+  item = g_list_nth (icon_view->priv->items,
+		     gtk_tree_path_get_indices(path)[0])->data;
+
+  if (!item)
+    return;
+  
+  moko_icon_view_unselect_item (icon_view, item);
+}
+
+/**
+ * moko_icon_view_get_selected_items:
+ * @icon_view: A #MokoIconView.
+ *
+ * Creates a list of paths of all selected items. Additionally, if you are
+ * planning on modifying the model after calling this function, you may
+ * want to convert the returned list into a list of #GtkTreeRowReference<!-- -->s.
+ * To do this, you can use gtk_tree_row_reference_new().
+ *
+ * To free the return value, use:
+ * <informalexample><programlisting>
+ * g_list_foreach (list, gtk_tree_path_free, NULL);
+ * g_list_free (list);
+ * </programlisting></informalexample>
+ *
+ * Return value: A #GList containing a #GtkTreePath for each selected row.
+ *
+ * Since: 2.6
+ **/
+GList *
+moko_icon_view_get_selected_items (MokoIconView *icon_view)
+{
+  GList *list;
+  GList *selected = NULL;
+  
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), NULL);
+  
+  for (list = icon_view->priv->items; list != NULL; list = list->next)
+    {
+      MokoIconViewItem *item = list->data;
+
+      if (item->selected)
+	{
+	  GtkTreePath *path = gtk_tree_path_new_from_indices (item->index, -1);
+
+	  selected = g_list_prepend (selected, path);
+	}
+    }
+
+  return selected;
+}
+
+/**
+ * moko_icon_view_select_all:
+ * @icon_view: A #MokoIconView.
+ * 
+ * Selects all the icons. @icon_view must has its selection mode set
+ * to #GTK_SELECTION_MULTIPLE.
+ *
+ * Since: 2.6
+ **/
+void
+moko_icon_view_select_all (MokoIconView *icon_view)
+{
+  GList *items;
+  gboolean dirty = FALSE;
+  
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+
+  if (icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
+    return;
+
+  for (items = icon_view->priv->items; items; items = items->next)
+    {
+      MokoIconViewItem *item = items->data;
+      
+      if (!item->selected)
+	{
+	  dirty = TRUE;
+	  item->selected = TRUE;
+	  moko_icon_view_queue_draw_item (icon_view, item);
+	}
+    }
+
+  if (dirty)
+    g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+/**
+ * moko_icon_view_unselect_all:
+ * @icon_view: A #MokoIconView.
+ * 
+ * Unselects all the icons.
+ *
+ * Since: 2.6
+ **/
+void
+moko_icon_view_unselect_all (MokoIconView *icon_view)
+{
+  gboolean dirty = FALSE;
+  
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+
+  if (icon_view->priv->selection_mode == GTK_SELECTION_BROWSE)
+    return;
+
+  dirty = moko_icon_view_unselect_all_internal (icon_view);
+
+  if (dirty)
+    g_signal_emit (icon_view, moko_icon_view_signals[SELECTION_CHANGED], 0);
+}
+
+/**
+ * moko_icon_view_path_is_selected:
+ * @icon_view: A #MokoIconView.
+ * @path: A #GtkTreePath to check selection on.
+ * 
+ * Returns %TRUE if the icon pointed to by @path is currently
+ * selected. If @icon does not point to a valid location, %FALSE is returned.
+ * 
+ * Return value: %TRUE if @path is selected.
+ *
+ * Since: 2.6
+ **/
+gboolean
+moko_icon_view_path_is_selected (MokoIconView *icon_view,
+				GtkTreePath *path)
+{
+  MokoIconViewItem *item;
+  
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), FALSE);
+  g_return_val_if_fail (icon_view->priv->model != NULL, FALSE);
+  g_return_val_if_fail (path != NULL, FALSE);
+  
+  item = g_list_nth (icon_view->priv->items,
+		     gtk_tree_path_get_indices(path)[0])->data;
+
+  if (!item)
+    return FALSE;
+  
+  return item->selected;
+}
+
+/**
+ * moko_icon_view_item_activated:
+ * @icon_view: A #MokoIconView
+ * @path: The #GtkTreePath to be activated
+ * 
+ * Activates the item determined by @path.
+ *
+ * Since: 2.6
+ **/
+void
+moko_icon_view_item_activated (MokoIconView      *icon_view,
+			      GtkTreePath      *path)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  g_return_if_fail (path != NULL);
+  
+  g_signal_emit (icon_view, moko_icon_view_signals[ITEM_ACTIVATED], 0, path);
+}
+
+/**
+ * moko_icon_view_set_orientation:
+ * @icon_view: a #MokoIconView
+ * @orientation: the relative position of texts and icons 
+ * 
+ * Sets the ::orientation property which determines whether the labels 
+ * are drawn beside the icons instead of below.
+ *
+ * Since: 2.6
+ **/
+void 
+moko_icon_view_set_orientation (MokoIconView    *icon_view,
+			       GtkOrientation  orientation)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+
+  if (icon_view->priv->orientation != orientation)
+    {
+      icon_view->priv->orientation = orientation;
+
+      moko_icon_view_invalidate_sizes (icon_view);
+      moko_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "orientation");
+    }
+}
+
+/**
+ * moko_icon_view_get_orientation:
+ * @icon_view: a #MokoIconView
+ * 
+ * Returns the value of the ::orientation property which determines 
+ * whether the labels are drawn beside the icons instead of below. 
+ * 
+ * Return value: the relative position of texts and icons 
+ *
+ * Since: 2.6
+ **/
+GtkOrientation
+moko_icon_view_get_orientation (MokoIconView *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), 
+			GTK_ORIENTATION_VERTICAL);
+
+  return icon_view->priv->orientation;
+}
+
+void moko_icon_view_set_columns (MokoIconView *icon_view,
+				gint         columns)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->columns != columns)
+    {
+      icon_view->priv->columns = columns;
+
+      moko_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "columns");
+    }  
+}
+
+gint
+moko_icon_view_get_columns (MokoIconView *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->columns;
+}
+
+void moko_icon_view_set_item_width (MokoIconView *icon_view,
+				   gint         item_width)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->item_width != item_width)
+    {
+      icon_view->priv->item_width = item_width;
+
+      moko_icon_view_invalidate_sizes (icon_view);
+      moko_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "item-width");
+    }  
+}
+
+gint
+moko_icon_view_get_item_width (MokoIconView *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->item_width;
+}
+
+
+void moko_icon_view_set_spacing (MokoIconView *icon_view,
+				gint         spacing)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->spacing != spacing)
+    {
+      icon_view->priv->spacing = spacing;
+
+      moko_icon_view_invalidate_sizes (icon_view);
+      moko_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "spacing");
+    }  
+}
+
+gint
+moko_icon_view_get_spacing (MokoIconView *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->spacing;
+}
+
+void moko_icon_view_set_row_spacing (MokoIconView *icon_view,
+				    gint         row_spacing)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->row_spacing != row_spacing)
+    {
+      icon_view->priv->row_spacing = row_spacing;
+
+      moko_icon_view_invalidate_sizes (icon_view);
+      moko_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "row-spacing");
+    }  
+}
+
+gint
+moko_icon_view_get_row_spacing (MokoIconView *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->row_spacing;
+}
+
+void moko_icon_view_set_column_spacing (MokoIconView *icon_view,
+				       gint         column_spacing)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->column_spacing != column_spacing)
+    {
+      icon_view->priv->column_spacing = column_spacing;
+
+      moko_icon_view_invalidate_sizes (icon_view);
+      moko_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "column-spacing");
+    }  
+}
+
+gint
+moko_icon_view_get_column_spacing (MokoIconView *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->column_spacing;
+}
+
+void moko_icon_view_set_margin (MokoIconView *icon_view,
+			       gint         margin)
+{
+  g_return_if_fail (MOKO_IS_ICON_VIEW (icon_view));
+  
+  if (icon_view->priv->margin != margin)
+    {
+      icon_view->priv->margin = margin;
+
+      moko_icon_view_invalidate_sizes (icon_view);
+      moko_icon_view_queue_layout (icon_view);
+      
+      g_object_notify (G_OBJECT (icon_view), "margin");
+    }  
+}
+
+gint
+moko_icon_view_get_margin (MokoIconView *icon_view)
+{
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW (icon_view), -1);
+
+  return icon_view->priv->margin;
+}
+
+/* Accessibility Support */
+
+static gpointer accessible_parent_class;
+static gpointer accessible_item_parent_class;
+static GQuark accessible_private_data_quark = 0;
+
+#define MOKO_TYPE_ICON_VIEW_ITEM_ACCESSIBLE      (moko_icon_view_item_accessible_get_type ())
+#define MOKO_ICON_VIEW_ITEM_ACCESSIBLE(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_ICON_VIEW_ITEM_ACCESSIBLE, MokoIconViewItemAccessible))
+#define MOKO_IS_ICON_VIEW_ITEM_ACCESSIBLE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_ICON_VIEW_ITEM_ACCESSIBLE))
+
+static GType moko_icon_view_item_accessible_get_type (void);
+
+enum {
+    ACTION_ACTIVATE,
+    LAST_ACTION
+};
+
+typedef struct
+{
+  AtkObject parent;
+
+  MokoIconViewItem *item;
+
+  GtkWidget *widget;
+
+  AtkStateSet *state_set;
+
+  gchar *text;
+
+  GtkTextBuffer *text_buffer;
+
+  gchar *action_descriptions[LAST_ACTION];
+  gchar *image_description;
+  guint action_idle_handler;
+} MokoIconViewItemAccessible;
+
+static const gchar *const moko_icon_view_item_accessible_action_names[] = 
+{
+  "activate",
+  NULL
+};
+
+static const gchar *const moko_icon_view_item_accessible_action_descriptions[] =
+{
+  "Activate item",
+  NULL
+};
+typedef struct _MokoIconViewItemAccessibleClass
+{
+  AtkObjectClass parent_class;
+
+} MokoIconViewItemAccessibleClass;
+
+static gboolean moko_icon_view_item_accessible_is_showing (MokoIconViewItemAccessible *item);
+
+static gboolean
+moko_icon_view_item_accessible_idle_do_action (gpointer data)
+{
+  MokoIconViewItemAccessible *item;
+  MokoIconView *icon_view;
+  GtkTreePath *path;
+
+  GDK_THREADS_ENTER ();
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (data);
+  item->action_idle_handler = 0;
+
+  if (item->widget != NULL)
+    {
+      icon_view = MOKO_ICON_VIEW (item->widget);
+      path = gtk_tree_path_new_from_indices (item->item->index, -1);
+      moko_icon_view_item_activated (icon_view, path);
+      gtk_tree_path_free (path);
+    }
+
+  GDK_THREADS_LEAVE ();
+
+  return FALSE;
+}
+
+static gboolean
+moko_icon_view_item_accessible_action_do_action (AtkAction *action,
+                                                gint       i)
+{
+  MokoIconViewItemAccessible *item;
+  MokoIconView *icon_view;
+
+  if (i < 0 || i >= LAST_ACTION) 
+    return FALSE;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (action);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return FALSE;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return FALSE;
+
+  icon_view = MOKO_ICON_VIEW (item->widget);
+
+  switch (i)
+    {
+    case ACTION_ACTIVATE:
+      if (!item->action_idle_handler)
+        item->action_idle_handler = g_idle_add (moko_icon_view_item_accessible_idle_do_action, item);
+      break;
+    default:
+      g_assert_not_reached ();
+      return FALSE;
+
+    }        
+  return TRUE;
+}
+
+static gint
+moko_icon_view_item_accessible_action_get_n_actions (AtkAction *action)
+{
+        return LAST_ACTION;
+}
+
+static const gchar *
+moko_icon_view_item_accessible_action_get_description (AtkAction *action,
+                                                      gint       i)
+{
+  MokoIconViewItemAccessible *item;
+
+  if (i < 0 || i >= LAST_ACTION) 
+    return NULL;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (action);
+
+  if (item->action_descriptions[i])
+    return item->action_descriptions[i];
+  else
+    return moko_icon_view_item_accessible_action_descriptions[i];
+}
+
+static const gchar *
+moko_icon_view_item_accessible_action_get_name (AtkAction *action,
+                                               gint       i)
+{
+  if (i < 0 || i >= LAST_ACTION) 
+    return NULL;
+
+  return moko_icon_view_item_accessible_action_names[i];
+}
+
+static gboolean
+moko_icon_view_item_accessible_action_set_description (AtkAction   *action,
+                                                      gint         i,
+                                                      const gchar *description)
+{
+  MokoIconViewItemAccessible *item;
+
+  if (i < 0 || i >= LAST_ACTION) 
+    return FALSE;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (action);
+
+  if (item->action_descriptions[i])
+    g_free (item->action_descriptions[i]);
+
+  item->action_descriptions[i] = g_strdup (description);
+
+  return TRUE;
+}
+
+static void
+atk_action_item_interface_init (AtkActionIface *iface)
+{
+  iface->do_action = moko_icon_view_item_accessible_action_do_action;
+  iface->get_n_actions = moko_icon_view_item_accessible_action_get_n_actions;
+  iface->get_description = moko_icon_view_item_accessible_action_get_description;
+  iface->get_name = moko_icon_view_item_accessible_action_get_name;
+  iface->set_description = moko_icon_view_item_accessible_action_set_description;
+}
+
+static const gchar *
+moko_icon_view_item_accessible_image_get_image_description (AtkImage *image)
+{
+  MokoIconViewItemAccessible *item;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (image);
+
+  return item->image_description;
+}
+
+static gboolean
+moko_icon_view_item_accessible_image_set_image_description (AtkImage    *image,
+                                                           const gchar *description)
+{
+  MokoIconViewItemAccessible *item;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (image);
+
+  g_free (item->image_description);
+  item->image_description = g_strdup (item->image_description);
+
+  return TRUE;
+}
+
+static void
+moko_icon_view_item_accessible_image_get_image_size (AtkImage *image,
+                                                    gint     *width,
+                                                    gint     *height)
+{
+  MokoIconViewItemAccessible *item;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (image);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return;
+
+  *width = item->item->pixbuf_width;  
+  *height = item->item->pixbuf_height;  
+}
+
+static void
+moko_icon_view_item_accessible_image_get_image_position (AtkImage    *image,
+                                                        gint        *x,
+                                                        gint        *y,
+                                                        AtkCoordType coord_type)
+{
+  MokoIconViewItemAccessible *item;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (image);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return;
+
+  atk_component_get_position (ATK_COMPONENT (image), x, y, coord_type);
+  *x+= item->item->pixbuf_x - item->item->x;
+  *y+= item->item->pixbuf_y - item->item->y;
+}
+
+static void
+atk_image_item_interface_init (AtkImageIface *iface)
+{
+  iface->get_image_description = moko_icon_view_item_accessible_image_get_image_description;
+  iface->set_image_description = moko_icon_view_item_accessible_image_set_image_description;
+  iface->get_image_size = moko_icon_view_item_accessible_image_get_image_size;
+  iface->get_image_position = moko_icon_view_item_accessible_image_get_image_position;
+}
+
+static gchar *
+moko_icon_view_item_accessible_text_get_text (AtkText *text,
+                                             gint     start_pos,
+                                             gint     end_pos)
+{
+  MokoIconViewItemAccessible *item;
+  GtkTextIter start, end;
+  GtkTextBuffer *buffer;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return NULL;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return NULL;
+
+  buffer = item->text_buffer;
+  gtk_text_buffer_get_iter_at_offset (buffer, &start, start_pos);
+  if (end_pos < 0)
+    gtk_text_buffer_get_end_iter (buffer, &end);
+  else
+    gtk_text_buffer_get_iter_at_offset (buffer, &end, end_pos);
+
+  return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+}
+
+static gunichar
+moko_icon_view_item_accessible_text_get_character_at_offset (AtkText *text,
+                                                            gint     offset)
+{
+  MokoIconViewItemAccessible *item;
+  GtkTextIter start, end;
+  GtkTextBuffer *buffer;
+  gchar *string;
+  gunichar unichar;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return '\0';
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return '\0';
+
+  buffer = item->text_buffer;
+  if (offset >= gtk_text_buffer_get_char_count (buffer))
+    return '\0';
+
+  gtk_text_buffer_get_iter_at_offset (buffer, &start, offset);
+  end = start;
+  gtk_text_iter_forward_char (&end);
+  string = gtk_text_buffer_get_slice (buffer, &start, &end, FALSE);
+  unichar = g_utf8_get_char (string);
+  g_free(string);
+
+  return unichar;
+}
+
+static void
+get_pango_text_offsets (PangoLayout     *layout,
+                        GtkTextBuffer   *buffer,
+                        gint             function,
+                        AtkTextBoundary  boundary_type,
+                        gint             offset,
+                        gint            *start_offset,
+                        gint            *end_offset,
+                        GtkTextIter     *start_iter,
+                        GtkTextIter     *end_iter)
+{
+  PangoLayoutIter *iter;
+  PangoLayoutLine *line, *prev_line = NULL, *prev_prev_line = NULL;
+  gint index, start_index, end_index;
+  const gchar *text;
+  gboolean found = FALSE;
+
+  text = pango_layout_get_text (layout);
+  index = g_utf8_offset_to_pointer (text, offset) - text;
+  iter = pango_layout_get_iter (layout);
+  do
+    {
+      line = pango_layout_iter_get_line (iter);
+      start_index = line->start_index;
+      end_index = start_index + line->length;
+
+      if (index >= start_index && index <= end_index)
+        {
+          /*
+           * Found line for offset
+           */
+          switch (function)
+            {
+            case 0:
+                  /*
+                   * We want the previous line
+                   */
+              if (prev_line)
+                {
+                  switch (boundary_type)
+                    {
+                    case ATK_TEXT_BOUNDARY_LINE_START:
+                      end_index = start_index;
+                      start_index = prev_line->start_index;
+                      break;
+                    case ATK_TEXT_BOUNDARY_LINE_END:
+                      if (prev_prev_line)
+                        start_index = prev_prev_line->start_index + 
+                                  prev_prev_line->length;
+                      end_index = prev_line->start_index + prev_line->length;
+                      break;
+                    default:
+                      g_assert_not_reached();
+                    }
+                }
+              else
+                start_index = end_index = 0;
+              break;
+            case 1:
+              switch (boundary_type)
+                {
+                case ATK_TEXT_BOUNDARY_LINE_START:
+                  if (pango_layout_iter_next_line (iter))
+                    end_index = pango_layout_iter_get_line (iter)->start_index;
+                  break;
+                case ATK_TEXT_BOUNDARY_LINE_END:
+                  if (prev_line)
+                    start_index = prev_line->start_index + 
+                                  prev_line->length;
+                  break;
+                default:
+                  g_assert_not_reached();
+                }
+              break;
+            case 2:
+               /*
+                * We want the next line
+                */
+              if (pango_layout_iter_next_line (iter))
+                {
+                  line = pango_layout_iter_get_line (iter);
+                  switch (boundary_type)
+                    {
+                    case ATK_TEXT_BOUNDARY_LINE_START:
+                      start_index = line->start_index;
+                      if (pango_layout_iter_next_line (iter))
+                        end_index = pango_layout_iter_get_line (iter)->start_index;
+                      else
+                        end_index = start_index + line->length;
+                      break;
+                    case ATK_TEXT_BOUNDARY_LINE_END:
+                      start_index = end_index;
+                      end_index = line->start_index + line->length;
+                      break;
+                    default:
+                      g_assert_not_reached();
+                    }
+                }
+              else
+                start_index = end_index;
+              break;
+            }
+          found = TRUE;
+          break;
+        }
+      prev_prev_line = prev_line; 
+      prev_line = line; 
+    }
+  while (pango_layout_iter_next_line (iter));
+
+  if (!found)
+    {
+      start_index = prev_line->start_index + prev_line->length;
+      end_index = start_index;
+    }
+  pango_layout_iter_free (iter);
+  *start_offset = g_utf8_pointer_to_offset (text, text + start_index);
+  *end_offset = g_utf8_pointer_to_offset (text, text + end_index);
+ 
+  gtk_text_buffer_get_iter_at_offset (buffer, start_iter, *start_offset);
+  gtk_text_buffer_get_iter_at_offset (buffer, end_iter, *end_offset);
+}
+
+static gchar*
+moko_icon_view_item_accessible_text_get_text_before_offset (AtkText         *text,
+                                                           gint            offset,
+                                                           AtkTextBoundary boundary_type,
+                                                           gint            *start_offset,
+                                                           gint            *end_offset)
+{
+  MokoIconViewItemAccessible *item;
+  GtkTextIter start, end;
+  GtkTextBuffer *buffer;
+  MokoIconView *icon_view;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return NULL;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return NULL;
+
+  buffer = item->text_buffer;
+
+  if (!gtk_text_buffer_get_char_count (buffer))
+    {
+      *start_offset = 0;
+      *end_offset = 0;
+      return g_strdup ("");
+    }
+  gtk_text_buffer_get_iter_at_offset (buffer, &start, offset);
+   
+  end = start;
+
+  switch (boundary_type)
+    {
+    case ATK_TEXT_BOUNDARY_CHAR:
+      gtk_text_iter_backward_char(&start);
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_START:
+      if (!gtk_text_iter_starts_word (&start))
+        gtk_text_iter_backward_word_start (&start);
+      end = start;
+      gtk_text_iter_backward_word_start(&start);
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_END:
+      if (gtk_text_iter_inside_word (&start) &&
+          !gtk_text_iter_starts_word (&start))
+        gtk_text_iter_backward_word_start (&start);
+      while (!gtk_text_iter_ends_word (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      end = start;
+      gtk_text_iter_backward_word_start(&start);
+      while (!gtk_text_iter_ends_word (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+      if (!gtk_text_iter_starts_sentence (&start))
+        gtk_text_iter_backward_sentence_start (&start);
+      end = start;
+      gtk_text_iter_backward_sentence_start (&start);
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
+      if (gtk_text_iter_inside_sentence (&start) &&
+          !gtk_text_iter_starts_sentence (&start))
+        gtk_text_iter_backward_sentence_start (&start);
+      while (!gtk_text_iter_ends_sentence (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      end = start;
+      gtk_text_iter_backward_sentence_start (&start);
+      while (!gtk_text_iter_ends_sentence (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      break;
+   case ATK_TEXT_BOUNDARY_LINE_START:
+   case ATK_TEXT_BOUNDARY_LINE_END:
+      icon_view = MOKO_ICON_VIEW (item->widget);
+      moko_icon_view_update_item_text (icon_view, item->item);
+      get_pango_text_offsets (icon_view->priv->layout,
+                              buffer,
+                              0,
+                              boundary_type,
+                              offset,
+                              start_offset,
+                              end_offset,
+                              &start,
+                              &end);
+      break;
+    }
+
+  *start_offset = gtk_text_iter_get_offset (&start);
+  *end_offset = gtk_text_iter_get_offset (&end);
+
+  return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+}
+
+static gchar*
+moko_icon_view_item_accessible_text_get_text_at_offset (AtkText         *text,
+                                                       gint            offset,
+                                                       AtkTextBoundary boundary_type,
+                                                       gint            *start_offset,
+                                                       gint            *end_offset)
+{
+  MokoIconViewItemAccessible *item;
+  GtkTextIter start, end;
+  GtkTextBuffer *buffer;
+  MokoIconView *icon_view;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return NULL;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return NULL;
+
+  buffer = item->text_buffer;
+
+  if (!gtk_text_buffer_get_char_count (buffer))
+    {
+      *start_offset = 0;
+      *end_offset = 0;
+      return g_strdup ("");
+    }
+  gtk_text_buffer_get_iter_at_offset (buffer, &start, offset);
+   
+  end = start;
+
+  switch (boundary_type)
+    {
+    case ATK_TEXT_BOUNDARY_CHAR:
+      gtk_text_iter_forward_char (&end);
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_START:
+      if (!gtk_text_iter_starts_word (&start))
+        gtk_text_iter_backward_word_start (&start);
+      if (gtk_text_iter_inside_word (&end))
+        gtk_text_iter_forward_word_end (&end);
+      while (!gtk_text_iter_starts_word (&end))
+        {
+          if (!gtk_text_iter_forward_char (&end))
+            break;
+        }
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_END:
+      if (gtk_text_iter_inside_word (&start) &&
+          !gtk_text_iter_starts_word (&start))
+        gtk_text_iter_backward_word_start (&start);
+      while (!gtk_text_iter_ends_word (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      gtk_text_iter_forward_word_end (&end);
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+      if (!gtk_text_iter_starts_sentence (&start))
+        gtk_text_iter_backward_sentence_start (&start);
+      if (gtk_text_iter_inside_sentence (&end))
+        gtk_text_iter_forward_sentence_end (&end);
+      while (!gtk_text_iter_starts_sentence (&end))
+        {
+          if (!gtk_text_iter_forward_char (&end))
+            break;
+        }
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
+      if (gtk_text_iter_inside_sentence (&start) &&
+          !gtk_text_iter_starts_sentence (&start))
+        gtk_text_iter_backward_sentence_start (&start);
+      while (!gtk_text_iter_ends_sentence (&start))
+        {
+          if (!gtk_text_iter_backward_char (&start))
+            break;
+        }
+      gtk_text_iter_forward_sentence_end (&end);
+      break;
+   case ATK_TEXT_BOUNDARY_LINE_START:
+   case ATK_TEXT_BOUNDARY_LINE_END:
+      icon_view = MOKO_ICON_VIEW (item->widget);
+      moko_icon_view_update_item_text (icon_view, item->item);
+      get_pango_text_offsets (icon_view->priv->layout,
+                              buffer,
+                              1,
+                              boundary_type,
+                              offset,
+                              start_offset,
+                              end_offset,
+                              &start,
+                              &end);
+      break;
+    }
+
+
+  *start_offset = gtk_text_iter_get_offset (&start);
+  *end_offset = gtk_text_iter_get_offset (&end);
+
+  return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+}
+
+static gchar*
+moko_icon_view_item_accessible_text_get_text_after_offset (AtkText         *text,
+                                                          gint            offset,
+                                                          AtkTextBoundary boundary_type,
+                                                          gint            *start_offset,
+                                                          gint            *end_offset)
+{
+  MokoIconViewItemAccessible *item;
+  GtkTextIter start, end;
+  GtkTextBuffer *buffer;
+  MokoIconView *icon_view;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return NULL;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return NULL;
+
+  buffer = item->text_buffer;
+
+  if (!gtk_text_buffer_get_char_count (buffer))
+    {
+      *start_offset = 0;
+      *end_offset = 0;
+      return g_strdup ("");
+    }
+  gtk_text_buffer_get_iter_at_offset (buffer, &start, offset);
+   
+  end = start;
+
+  switch (boundary_type)
+    {
+    case ATK_TEXT_BOUNDARY_CHAR:
+      gtk_text_iter_forward_char(&start);
+      gtk_text_iter_forward_chars(&end, 2);
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_START:
+      if (gtk_text_iter_inside_word (&end))
+        gtk_text_iter_forward_word_end (&end);
+      while (!gtk_text_iter_starts_word (&end))
+        {
+          if (!gtk_text_iter_forward_char (&end))
+            break;
+        }
+      start = end;
+      if (!gtk_text_iter_is_end (&end))
+        {
+          gtk_text_iter_forward_word_end (&end);
+          while (!gtk_text_iter_starts_word (&end))
+            {
+              if (!gtk_text_iter_forward_char (&end))
+                break;
+            }
+        }
+      break;
+    case ATK_TEXT_BOUNDARY_WORD_END:
+      gtk_text_iter_forward_word_end (&end);
+      start = end;
+      if (!gtk_text_iter_is_end (&end))
+        gtk_text_iter_forward_word_end (&end);
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_START:
+      if (gtk_text_iter_inside_sentence (&end))
+        gtk_text_iter_forward_sentence_end (&end);
+      while (!gtk_text_iter_starts_sentence (&end))
+        {
+          if (!gtk_text_iter_forward_char (&end))
+            break;
+        }
+      start = end;
+      if (!gtk_text_iter_is_end (&end))
+        {
+          gtk_text_iter_forward_sentence_end (&end);
+          while (!gtk_text_iter_starts_sentence (&end))
+            {
+              if (!gtk_text_iter_forward_char (&end))
+                break;
+            }
+        }
+      break;
+    case ATK_TEXT_BOUNDARY_SENTENCE_END:
+      gtk_text_iter_forward_sentence_end (&end);
+      start = end;
+      if (!gtk_text_iter_is_end (&end))
+        gtk_text_iter_forward_sentence_end (&end);
+      break;
+   case ATK_TEXT_BOUNDARY_LINE_START:
+   case ATK_TEXT_BOUNDARY_LINE_END:
+      icon_view = MOKO_ICON_VIEW (item->widget);
+      moko_icon_view_update_item_text (icon_view, item->item);
+      get_pango_text_offsets (icon_view->priv->layout,
+                              buffer,
+                              2,
+                              boundary_type,
+                              offset,
+                              start_offset,
+                              end_offset,
+                              &start,
+                              &end);
+      break;
+    }
+  *start_offset = gtk_text_iter_get_offset (&start);
+  *end_offset = gtk_text_iter_get_offset (&end);
+
+  return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+}
+
+static gint
+moko_icon_view_item_accessible_text_get_character_count (AtkText *text)
+{
+  MokoIconViewItemAccessible *item;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return 0;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return 0;
+
+  return gtk_text_buffer_get_char_count (item->text_buffer);
+}
+
+static void
+moko_icon_view_item_accessible_text_get_character_extents (AtkText      *text,
+                                                          gint         offset,
+                                                          gint         *x,
+                                                          gint         *y,
+                                                          gint         *width,
+                                                          gint         *height,
+                                                          AtkCoordType coord_type)
+{
+  MokoIconViewItemAccessible *item;
+  MokoIconView *icon_view;
+  PangoRectangle char_rect;
+  const gchar *item_text;
+  gint index;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return;
+
+  icon_view = MOKO_ICON_VIEW (item->widget);
+  moko_icon_view_update_item_text (icon_view, item->item);
+  item_text = pango_layout_get_text (icon_view->priv->layout);
+  index = g_utf8_offset_to_pointer (item_text, offset) - item_text;
+  pango_layout_index_to_pos (icon_view->priv->layout, index, &char_rect);
+
+  atk_component_get_position (ATK_COMPONENT (text), x, y, coord_type);
+  *x += item->item->layout_x - item->item->x + char_rect.x / PANGO_SCALE;
+  /* Look at moko_icon_view_paint_item() to see where the text is. */
+  *x -=  ((item->item->width - item->item->layout_width) / 2) + (MAX (item->item->pixbuf_width, icon_view->priv->item_width) - item->item->width) / 2,
+  *y += item->item->layout_y - item->item->y + char_rect.y / PANGO_SCALE;
+  *width = char_rect.width / PANGO_SCALE;
+  *height = char_rect.height / PANGO_SCALE;
+}
+
+static gint
+moko_icon_view_item_accessible_text_get_offset_at_point (AtkText      *text,
+                                                        gint          x,
+                                                        gint          y,
+                                                        AtkCoordType coord_type)
+{
+  MokoIconViewItemAccessible *item;
+  MokoIconView *icon_view;
+  const gchar *item_text;
+  gint index;
+  gint offset;
+  gint l_x, l_y;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (text);
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return -1;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return -1;
+
+  icon_view = MOKO_ICON_VIEW (item->widget);
+  moko_icon_view_update_item_text (icon_view, item->item);
+  atk_component_get_position (ATK_COMPONENT (text), &l_x, &l_y, coord_type);
+  x -= l_x + item->item->layout_x - item->item->x;
+  x +=  ((item->item->width - item->item->layout_width) / 2) + (MAX (item->item->pixbuf_width, icon_view->priv->item_width) - item->item->width) / 2,
+  y -= l_y + item->item->layout_y - item->item->y;
+  item_text = pango_layout_get_text (icon_view->priv->layout);
+  if (!pango_layout_xy_to_index (icon_view->priv->layout, 
+                                x * PANGO_SCALE,
+                                y * PANGO_SCALE,
+                                &index, NULL))
+    {
+      if (x < 0 || y < 0)
+        index = 0;
+      else
+        index = -1;
+    } 
+  if (index == -1)
+    offset = g_utf8_strlen (item_text, -1);
+  else
+    offset = g_utf8_pointer_to_offset (item_text, item_text + index);
+
+  return offset;
+}
+
+static void
+atk_text_item_interface_init (AtkTextIface *iface)
+{
+  iface->get_text = moko_icon_view_item_accessible_text_get_text;
+  iface->get_character_at_offset = moko_icon_view_item_accessible_text_get_character_at_offset;
+  iface->get_text_before_offset = moko_icon_view_item_accessible_text_get_text_before_offset;
+  iface->get_text_at_offset = moko_icon_view_item_accessible_text_get_text_at_offset;
+  iface->get_text_after_offset = moko_icon_view_item_accessible_text_get_text_after_offset;
+  iface->get_character_count = moko_icon_view_item_accessible_text_get_character_count;
+  iface->get_character_extents = moko_icon_view_item_accessible_text_get_character_extents;
+  iface->get_offset_at_point = moko_icon_view_item_accessible_text_get_offset_at_point;
+}
+
+static void
+moko_icon_view_item_accessible_get_extents (AtkComponent *component,
+                                           gint         *x,
+                                           gint         *y,
+                                           gint         *width,
+                                           gint         *height,
+                                           AtkCoordType  coord_type)
+{
+  MokoIconViewItemAccessible *item;
+  AtkObject *parent_obj;
+  gint l_x, l_y;
+
+  g_return_if_fail (MOKO_IS_ICON_VIEW_ITEM_ACCESSIBLE (component));
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (component);
+  if (!GTK_IS_WIDGET (item->widget))
+    return;
+
+  if (atk_state_set_contains_state (item->state_set, ATK_STATE_DEFUNCT))
+    return;
+
+  *width = item->item->width;
+  *height = item->item->height;
+  if (moko_icon_view_item_accessible_is_showing (item))
+    {
+      parent_obj = gtk_widget_get_accessible (item->widget);
+      atk_component_get_position (ATK_COMPONENT (parent_obj), &l_x, &l_y, coord_type);
+      *x = l_x + item->item->x;
+      *y = l_y + item->item->y;
+    }
+  else
+    {
+      *x = G_MININT;
+      *y = G_MININT;
+    }
+}
+
+static gboolean
+moko_icon_view_item_accessible_grab_focus (AtkComponent *component)
+{
+  MokoIconViewItemAccessible *item;
+  GtkWidget *toplevel;
+
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW_ITEM_ACCESSIBLE (component), FALSE);
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (component);
+  if (!GTK_IS_WIDGET (item->widget))
+    return FALSE;
+
+  gtk_widget_grab_focus (item->widget);
+  moko_icon_view_set_cursor_item (MOKO_ICON_VIEW (item->widget), item->item);
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (item->widget));
+  if (GTK_WIDGET_TOPLEVEL (toplevel))
+    gtk_window_present (GTK_WINDOW (toplevel));
+
+  return TRUE;
+}
+
+static void
+atk_component_item_interface_init (AtkComponentIface *iface)
+{
+  iface->get_extents = moko_icon_view_item_accessible_get_extents;
+  iface->grab_focus = moko_icon_view_item_accessible_grab_focus;
+}
+
+static gboolean
+moko_icon_view_item_accessible_add_state (MokoIconViewItemAccessible *item,
+                                         AtkStateType               state_type,
+                                         gboolean                   emit_signal)
+{
+  gboolean rc;
+
+  rc = atk_state_set_add_state (item->state_set, state_type);
+  /*
+   * The signal should only be generated if the value changed,
+   * not when the item is set up.  So states that are set
+   * initially should pass FALSE as the emit_signal argument.
+   */
+
+  if (emit_signal)
+    {
+      atk_object_notify_state_change (ATK_OBJECT (item), state_type, TRUE);
+      /* If state_type is ATK_STATE_VISIBLE, additional notification */
+      if (state_type == ATK_STATE_VISIBLE)
+        g_signal_emit_by_name (item, "visible_data_changed");
+    }
+
+  return rc;
+}
+
+static gboolean
+moko_icon_view_item_accessible_remove_state (MokoIconViewItemAccessible *item,
+                                            AtkStateType               state_type,
+                                            gboolean                   emit_signal)
+{
+  if (atk_state_set_contains_state (item->state_set, state_type))
+    {
+      gboolean rc;
+
+      rc = atk_state_set_remove_state (item->state_set, state_type);
+      /*
+       * The signal should only be generated if the value changed,
+       * not when the item is set up.  So states that are set
+       * initially should pass FALSE as the emit_signal argument.
+       */
+
+      if (emit_signal)
+        {
+          atk_object_notify_state_change (ATK_OBJECT (item), state_type, FALSE);
+          /* If state_type is ATK_STATE_VISIBLE, additional notification */
+          if (state_type == ATK_STATE_VISIBLE)
+            g_signal_emit_by_name (item, "visible_data_changed");
+        }
+
+      return rc;
+    }
+  else
+    return FALSE;
+}
+
+static gboolean
+moko_icon_view_item_accessible_is_showing (MokoIconViewItemAccessible *item)
+{
+  MokoIconView *icon_view;
+  GdkRectangle visible_rect;
+  gboolean is_showing;
+
+  /*
+   * An item is considered "SHOWING" if any part of the item is in the
+   * visible rectangle.
+   */
+
+  if (!MOKO_IS_ICON_VIEW (item->widget))
+    return FALSE;
+
+  if (item->item == NULL)
+    return FALSE;
+
+  icon_view = MOKO_ICON_VIEW (item->widget);
+  visible_rect.x = 0;
+  if (icon_view->priv->hadjustment)
+    visible_rect.x += icon_view->priv->hadjustment->value;
+  visible_rect.y = 0;
+  if (icon_view->priv->hadjustment)
+    visible_rect.y += icon_view->priv->vadjustment->value;
+  visible_rect.width = item->widget->allocation.width;
+  visible_rect.height = item->widget->allocation.height;
+
+  if (((item->item->x + item->item->width) < visible_rect.x) ||
+     ((item->item->y + item->item->height) < (visible_rect.y)) ||
+     (item->item->x > (visible_rect.x + visible_rect.width)) ||
+     (item->item->y > (visible_rect.y + visible_rect.height)))
+    is_showing =  FALSE;
+  else
+    is_showing = TRUE;
+
+  return is_showing;
+}
+
+static gboolean
+moko_icon_view_item_accessible_set_visibility (MokoIconViewItemAccessible *item,
+                                              gboolean                   emit_signal)
+{
+  if (moko_icon_view_item_accessible_is_showing (item))
+    return moko_icon_view_item_accessible_add_state (item, ATK_STATE_SHOWING,
+						    emit_signal);
+  else
+    return moko_icon_view_item_accessible_remove_state (item, ATK_STATE_SHOWING,
+						       emit_signal);
+}
+
+static void
+moko_icon_view_item_accessible_object_init (MokoIconViewItemAccessible *item)
+{
+  gint i;
+
+  item->state_set = atk_state_set_new ();
+
+  atk_state_set_add_state (item->state_set, ATK_STATE_ENABLED);
+  atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSABLE);
+  atk_state_set_add_state (item->state_set, ATK_STATE_SENSITIVE);
+  atk_state_set_add_state (item->state_set, ATK_STATE_SELECTABLE);
+  atk_state_set_add_state (item->state_set, ATK_STATE_VISIBLE);
+
+  for (i = 0; i < LAST_ACTION; i++)
+    item->action_descriptions[i] = NULL;
+
+  item->image_description = NULL;
+
+  item->action_idle_handler = 0;
+}
+
+static void
+moko_icon_view_item_accessible_finalize (GObject *object)
+{
+  MokoIconViewItemAccessible *item;
+  gint i;
+
+  g_return_if_fail (MOKO_IS_ICON_VIEW_ITEM_ACCESSIBLE (object));
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (object);
+
+  if (item->widget)
+    g_object_remove_weak_pointer (G_OBJECT (item->widget), (gpointer) &item->widget);
+
+  if (item->state_set)
+    g_object_unref (item->state_set);
+
+  if (item->text_buffer)
+     g_object_unref (item->text_buffer);
+
+  for (i = 0; i < LAST_ACTION; i++)
+    g_free (item->action_descriptions[i]);
+
+  g_free (item->image_description);
+
+  if (item->action_idle_handler)
+    {
+      g_source_remove (item->action_idle_handler);
+      item->action_idle_handler = 0;
+    }
+
+  G_OBJECT_CLASS (accessible_item_parent_class)->finalize (object);
+}
+
+static G_CONST_RETURN gchar*
+moko_icon_view_item_accessible_get_name (AtkObject *obj)
+{
+  if (obj->name)
+    return obj->name;
+  else
+    {
+      MokoIconViewItemAccessible *item;
+      GtkTextIter start_iter;
+      GtkTextIter end_iter;
+
+      item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (obj);
+ 
+      gtk_text_buffer_get_start_iter (item->text_buffer, &start_iter); 
+      gtk_text_buffer_get_end_iter (item->text_buffer, &end_iter); 
+
+      return gtk_text_buffer_get_text (item->text_buffer, &start_iter, &end_iter, FALSE);
+    }
+}
+
+static AtkObject*
+moko_icon_view_item_accessible_get_parent (AtkObject *obj)
+{
+  MokoIconViewItemAccessible *item;
+
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW_ITEM_ACCESSIBLE (obj), NULL);
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (obj);
+
+  if (item->widget)
+    return gtk_widget_get_accessible (item->widget);
+  else
+    return NULL;
+}
+
+static gint
+moko_icon_view_item_accessible_get_index_in_parent (AtkObject *obj)
+{
+  MokoIconViewItemAccessible *item;
+
+  g_return_val_if_fail (MOKO_IS_ICON_VIEW_ITEM_ACCESSIBLE (obj), 0);
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (obj);
+
+  return item->item->index; 
+}
+
+static AtkStateSet *
+moko_icon_view_item_accessible_ref_state_set (AtkObject *obj)
+{
+  MokoIconViewItemAccessible *item;
+  MokoIconView *icon_view;
+
+  item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (obj);
+  g_return_val_if_fail (item->state_set, NULL);
+
+  if (!item->widget)
+    return NULL;
+
+  icon_view = MOKO_ICON_VIEW (item->widget);
+  if (icon_view->priv->cursor_item == item->item)
+    atk_state_set_add_state (item->state_set, ATK_STATE_FOCUSED);
+  else
+    atk_state_set_remove_state (item->state_set, ATK_STATE_FOCUSED);
+
+  return g_object_ref (item->state_set);
+}
+
+static void
+moko_icon_view_item_accessible_class_init (AtkObjectClass *klass)
+{
+  GObjectClass *gobject_class;
+
+  accessible_item_parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = (GObjectClass *)klass;
+
+  gobject_class->finalize = moko_icon_view_item_accessible_finalize;
+
+  klass->get_index_in_parent = moko_icon_view_item_accessible_get_index_in_parent; 
+  klass->get_name = moko_icon_view_item_accessible_get_name; 
+  klass->get_parent = moko_icon_view_item_accessible_get_parent; 
+  klass->ref_state_set = moko_icon_view_item_accessible_ref_state_set; 
+}
+
+static GType
+moko_icon_view_item_accessible_get_type (void)
+{
+  static GType type = 0;
+
+  if (!type)
+    {
+      static const GTypeInfo tinfo =
+      {
+        sizeof (MokoIconViewItemAccessibleClass),
+        (GBaseInitFunc) NULL, /* base init */
+        (GBaseFinalizeFunc) NULL, /* base finalize */
+        (GClassInitFunc) moko_icon_view_item_accessible_class_init, /* class init */
+        (GClassFinalizeFunc) NULL, /* class finalize */
+        NULL, /* class data */
+        sizeof (MokoIconViewItemAccessible), /* instance size */
+        0, /* nb preallocs */
+        (GInstanceInitFunc) moko_icon_view_item_accessible_object_init, /* instance init */
+        NULL /* value table */
+      };
+
+      static const GInterfaceInfo atk_component_info =
+      {
+        (GInterfaceInitFunc) atk_component_item_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+      static const GInterfaceInfo atk_action_info =
+      {
+        (GInterfaceInitFunc) atk_action_item_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+      static const GInterfaceInfo atk_image_info =
+      {
+        (GInterfaceInitFunc) atk_image_item_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+      static const GInterfaceInfo atk_text_info =
+      {
+        (GInterfaceInitFunc) atk_text_item_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+
+      type = g_type_register_static (ATK_TYPE_OBJECT,
+                                     "MokoIconViewItemAccessible", &tinfo, 0);
+      g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
+                                   &atk_component_info);
+      g_type_add_interface_static (type, ATK_TYPE_ACTION,
+                                   &atk_action_info);
+      g_type_add_interface_static (type, ATK_TYPE_IMAGE,
+                                   &atk_image_info);
+      g_type_add_interface_static (type, ATK_TYPE_TEXT,
+                                   &atk_text_info);
+    }
+
+  return type;
+}
+
+#define MOKO_TYPE_ICON_VIEW_ACCESSIBLE      (moko_icon_view_accessible_get_type ())
+#define MOKO_ICON_VIEW_ACCESSIBLE(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_ICON_VIEW_ACCESSIBLE, MokoIconViewAccessible))
+#define MOKO_IS_ICON_VIEW_ACCESSIBLE(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_ICON_VIEW_ACCESSIBLE))
+
+static GType moko_icon_view_accessible_get_type (void);
+
+typedef struct
+{
+   AtkObject parent;
+} MokoIconViewAccessible;
+
+typedef struct
+{
+  AtkObject *item;
+  gint       index;
+} MokoIconViewItemAccessibleInfo;
+
+typedef struct
+{
+  GList *items;
+
+  GtkAdjustment *old_hadj;
+  GtkAdjustment *old_vadj;
+
+  GtkTreeModel *model;
+
+} MokoIconViewAccessiblePrivate;
+
+static MokoIconViewAccessiblePrivate *
+moko_icon_view_accessible_get_priv (AtkObject *accessible)
+{
+  return g_object_get_qdata (G_OBJECT (accessible),
+                             accessible_private_data_quark);
+}
+
+static void
+moko_icon_view_item_accessible_info_new (AtkObject *accessible,
+                                        AtkObject *item,
+                                        gint       index)
+{
+  MokoIconViewItemAccessibleInfo *info;
+  MokoIconViewItemAccessibleInfo *tmp_info;
+  MokoIconViewAccessiblePrivate *priv;
+  GList *items;
+
+  info = g_new (MokoIconViewItemAccessibleInfo, 1);
+  info->item = item;
+  info->index = index;
+
+  priv = moko_icon_view_accessible_get_priv (accessible);
+  items = priv->items;
+  while (items)
+    {
+      tmp_info = items->data;
+      if (tmp_info->index > index)
+        break;
+      items = items->next;
+    }
+  priv->items = g_list_insert_before (priv->items, items, info);
+  priv->old_hadj = NULL;
+  priv->old_vadj = NULL;
+}
+
+static gint
+moko_icon_view_accessible_get_n_children (AtkObject *accessible)
+{
+  MokoIconView *icon_view;
+  GtkWidget *widget;
+
+  widget = GTK_ACCESSIBLE (accessible)->widget;
+  if (!widget)
+      return 0;
+
+  icon_view = MOKO_ICON_VIEW (widget);
+
+  return g_list_length (icon_view->priv->items);
+}
+
+static AtkObject *
+moko_icon_view_accessible_find_child (AtkObject *accessible,
+                                     gint       index)
+{
+  MokoIconViewAccessiblePrivate *priv;
+  MokoIconViewItemAccessibleInfo *info;
+  GList *items;
+
+  priv = moko_icon_view_accessible_get_priv (accessible);
+  items = priv->items;
+
+  while (items)
+    {
+      info = items->data;
+      if (info->index == index)
+        return info->item;
+      items = items->next; 
+    }
+  return NULL;
+}
+
+static AtkObject *
+moko_icon_view_accessible_ref_child (AtkObject *accessible,
+                                    gint       index)
+{
+  MokoIconView *icon_view;
+  GtkWidget *widget;
+  GList *icons;
+  AtkObject *obj;
+  MokoIconViewItemAccessible *a11y_item;
+
+  widget = GTK_ACCESSIBLE (accessible)->widget;
+  if (!widget)
+    return NULL;
+
+  icon_view = MOKO_ICON_VIEW (widget);
+  icons = g_list_nth (icon_view->priv->items, index);
+  obj = NULL;
+  if (icons)
+    {
+      MokoIconViewItem *item = icons->data;
+   
+      g_return_val_if_fail (item->index == index, NULL);
+      obj = moko_icon_view_accessible_find_child (accessible, index);
+      if (!obj)
+        {
+          obj = g_object_new (moko_icon_view_item_accessible_get_type (), NULL);
+          moko_icon_view_item_accessible_info_new (accessible,
+                                                  obj,
+                                                  index);
+          obj->role = ATK_ROLE_ICON;
+          a11y_item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (obj);
+          a11y_item->item = item;
+          a11y_item->widget = widget;
+          a11y_item->text_buffer = gtk_text_buffer_new (NULL);
+          moko_icon_view_update_item_text (icon_view, item);
+          gtk_text_buffer_set_text (a11y_item->text_buffer, 
+                                    pango_layout_get_text (icon_view->priv->layout), 
+                                    -1);
+          moko_icon_view_item_accessible_set_visibility (a11y_item, FALSE);
+          g_object_add_weak_pointer (G_OBJECT (widget), (gpointer) &(a11y_item->widget));
+       }
+      g_object_ref (obj);
+    }
+  return obj;
+}
+
+static void
+moko_icon_view_accessible_traverse_items (MokoIconViewAccessible *view,
+                                         GList                 *list)
+{
+  MokoIconViewAccessiblePrivate *priv;
+  MokoIconViewItemAccessibleInfo *info;
+  MokoIconViewItemAccessible *item;
+  GList *items;
+  
+  priv =  moko_icon_view_accessible_get_priv (ATK_OBJECT (view));
+  if (priv->items)
+    {
+      GtkWidget *widget;
+      gboolean act_on_item;
+
+      widget = GTK_ACCESSIBLE (view)->widget;
+      if (widget == NULL)
+        return;
+
+      items = priv->items;
+
+      act_on_item = (list == NULL);
+
+      while (items)
+        {
+
+          info = (MokoIconViewItemAccessibleInfo *)items->data;
+          item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (info->item);
+
+          if (act_on_item == FALSE && list == items)
+            act_on_item = TRUE;
+
+          if (act_on_item)
+	    moko_icon_view_item_accessible_set_visibility (item, TRUE);
+
+          items = items->next;
+       }
+   }
+}
+
+static void
+moko_icon_view_accessible_adjustment_changed (GtkAdjustment *adjustment,
+                                             MokoIconView   *icon_view)
+{
+  AtkObject *obj;
+  MokoIconViewAccessible *view;
+
+  /*
+   * The scrollbars have changed
+   */
+  obj = gtk_widget_get_accessible (GTK_ACCESSIBLE (icon_view));
+  view = MOKO_ICON_VIEW_ACCESSIBLE (obj);
+
+  moko_icon_view_accessible_traverse_items (view, NULL);
+}
+
+static void
+moko_icon_view_accessible_set_scroll_adjustments (GtkWidget      *widget,
+                                                 GtkAdjustment *hadj,
+                                                 GtkAdjustment *vadj)
+{
+  AtkObject *atk_obj;
+  MokoIconViewAccessiblePrivate *priv;
+
+  atk_obj = gtk_widget_get_accessible (widget);
+  priv = moko_icon_view_accessible_get_priv (atk_obj);
+
+  if (priv->old_hadj != hadj)
+    {
+      if (priv->old_hadj)
+        {
+          g_object_remove_weak_pointer (G_OBJECT (priv->old_hadj),
+                                        (gpointer *)&priv->old_hadj);
+          
+          g_signal_handlers_disconnect_by_func (priv->old_hadj,
+                                                (gpointer) moko_icon_view_accessible_adjustment_changed,
+                                                widget);
+        }
+      priv->old_hadj = hadj;
+      if (priv->old_hadj)
+        {
+          g_object_add_weak_pointer (G_OBJECT (priv->old_hadj),
+                                     (gpointer *)&priv->old_hadj);
+          g_signal_connect (hadj,
+                            "value-changed",
+                            G_CALLBACK (moko_icon_view_accessible_adjustment_changed),
+                            widget);
+        }
+    }
+  if (priv->old_vadj != vadj)
+    {
+      if (priv->old_vadj)
+        {
+          g_object_remove_weak_pointer (G_OBJECT (priv->old_vadj),
+                                        (gpointer *)&priv->old_vadj);
+          
+          g_signal_handlers_disconnect_by_func (priv->old_vadj,
+                                                (gpointer) moko_icon_view_accessible_adjustment_changed,
+                                                widget);
+        }
+      priv->old_vadj = vadj;
+      if (priv->old_vadj)
+        {
+          g_object_add_weak_pointer (G_OBJECT (priv->old_vadj),
+                                     (gpointer *)&priv->old_vadj);
+          g_signal_connect (vadj,
+                            "value-changed",
+                            G_CALLBACK (moko_icon_view_accessible_adjustment_changed),
+                            widget);
+        }
+    }
+}
+
+static void
+moko_icon_view_accessible_model_row_changed (GtkTreeModel *tree_model,
+                                            GtkTreePath  *path,
+                                            GtkTreeIter  *iter,
+                                            gpointer     user_data)
+{
+  AtkObject *atk_obj;
+
+  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
+  g_signal_emit_by_name (atk_obj, "visible-data-changed");
+
+  return;
+}
+
+static void
+moko_icon_view_accessible_model_row_inserted (GtkTreeModel *tree_model,
+                                             GtkTreePath  *path,
+                                             GtkTreeIter  *iter,
+                                             gpointer     user_data)
+{
+  MokoIconViewAccessiblePrivate *priv;
+  MokoIconViewItemAccessibleInfo *info;
+  MokoIconViewAccessible *view;
+  MokoIconViewItemAccessible *item;
+  GList *items;
+  GList *tmp_list;
+  AtkObject *atk_obj;
+  gint index;
+
+  index = gtk_tree_path_get_indices(path)[0];
+  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
+  view = MOKO_ICON_VIEW_ACCESSIBLE (atk_obj);
+  priv = moko_icon_view_accessible_get_priv (atk_obj);
+
+  items = priv->items;
+  tmp_list = NULL;
+  while (items)
+    {
+      info = items->data;
+      item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (info->item);
+      if (info->index != item->item->index)
+        {
+          if (info->index < index)
+            g_warning ("Unexpected index value on insertion %d %d", index, info->index);
+ 
+          if (tmp_list == NULL)
+            tmp_list = items;
+   
+          info->index = item->item->index;
+        }
+
+      items = items->next;
+    }
+  moko_icon_view_accessible_traverse_items (view, tmp_list);
+  g_signal_emit_by_name (atk_obj, "children_changed::add",
+                         index, NULL, NULL);
+  return;
+}
+
+static void
+moko_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model,
+                                            GtkTreePath  *path,
+                                            gpointer     user_data)
+{
+  MokoIconViewAccessiblePrivate *priv;
+  MokoIconViewItemAccessibleInfo *info;
+  MokoIconViewAccessible *view;
+  MokoIconViewItemAccessible *item;
+  GList *items;
+  GList *tmp_list;
+  GList *deleted_item;
+  AtkObject *atk_obj;
+  gint index;
+
+  index = gtk_tree_path_get_indices(path)[0];
+  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
+  view = MOKO_ICON_VIEW_ACCESSIBLE (atk_obj);
+  priv = moko_icon_view_accessible_get_priv (atk_obj);
+
+  items = priv->items;
+  tmp_list = NULL;
+  deleted_item = NULL;
+  info = NULL;
+  while (items)
+    {
+      info = items->data;
+      item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (info->item);
+      if (info->index == index)
+        {
+          deleted_item = items;
+        }
+      if (info->index != item->item->index)
+        {
+          if (tmp_list == NULL)
+            tmp_list = items;
+          else    
+            info->index = item->item->index;
+        }
+
+      items = items->next;
+    }
+  moko_icon_view_accessible_traverse_items (view, tmp_list);
+  if (deleted_item)
+    {
+      info = deleted_item->data;
+      moko_icon_view_item_accessible_add_state (MOKO_ICON_VIEW_ITEM_ACCESSIBLE (info->item), ATK_STATE_DEFUNCT, TRUE);
+    }
+  g_signal_emit_by_name (atk_obj, "children_changed::remove",
+                         index, NULL, NULL);
+  if (deleted_item)
+    {
+      priv->items = g_list_remove_link (priv->items, deleted_item);
+      g_free (info);
+    }
+
+  return;
+}
+
+static gint
+moko_icon_view_accessible_item_compare (MokoIconViewItemAccessibleInfo *i1,
+                                       MokoIconViewItemAccessibleInfo *i2)
+{
+  return i1->index - i2->index;
+}
+
+static void
+moko_icon_view_accessible_model_rows_reordered (GtkTreeModel *tree_model,
+                                               GtkTreePath  *path,
+                                               GtkTreeIter  *iter,
+                                               gint         *new_order,
+                                               gpointer     user_data)
+{
+  MokoIconViewAccessiblePrivate *priv;
+  MokoIconViewItemAccessibleInfo *info;
+  MokoIconViewAccessible *view;
+  MokoIconView *icon_view;
+  MokoIconViewItemAccessible *item;
+  GList *items;
+  GList *tmp_list;
+  AtkObject *atk_obj;
+
+  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (user_data));
+  icon_view = MOKO_ICON_VIEW (user_data);
+  view = MOKO_ICON_VIEW_ACCESSIBLE (atk_obj);
+  priv = moko_icon_view_accessible_get_priv (atk_obj);
+
+  items = priv->items;
+  tmp_list = NULL;
+  while (items)
+    {
+      info = items->data;
+      item = MOKO_ICON_VIEW_ITEM_ACCESSIBLE (info->item);
+      info->index = new_order[info->index];
+      tmp_list = g_list_nth (icon_view->priv->items, info->index);
+      item->item = tmp_list->data;
+      items = items->next;
+    }
+  priv->items = g_list_sort (priv->items, 
+                             (GCompareFunc)moko_icon_view_accessible_item_compare);
+
+  return;
+}
+
+static void
+moko_icon_view_accessible_disconnect_model_signals (GtkTreeModel *model,
+                                                   GtkWidget *widget)
+{
+  GObject *obj;
+
+  obj = G_OBJECT (model);
+  g_signal_handlers_disconnect_by_func (obj, (gpointer) moko_icon_view_accessible_model_row_changed, widget);
+  g_signal_handlers_disconnect_by_func (obj, (gpointer) moko_icon_view_accessible_model_row_inserted, widget);
+  g_signal_handlers_disconnect_by_func (obj, (gpointer) moko_icon_view_accessible_model_row_deleted, widget);
+  g_signal_handlers_disconnect_by_func (obj, (gpointer) moko_icon_view_accessible_model_rows_reordered, widget);
+}
+
+static void
+moko_icon_view_accessible_connect_model_signals (MokoIconView *icon_view)
+{
+  GObject *obj;
+
+  obj = G_OBJECT (icon_view->priv->model);
+  g_signal_connect_data (obj, "row-changed",
+                         (GCallback) moko_icon_view_accessible_model_row_changed,
+                         icon_view, NULL, 0);
+  g_signal_connect_data (obj, "row-inserted",
+                         (GCallback) moko_icon_view_accessible_model_row_inserted, 
+                         icon_view, NULL, G_CONNECT_AFTER);
+  g_signal_connect_data (obj, "row-deleted",
+                         (GCallback) moko_icon_view_accessible_model_row_deleted, 
+                         icon_view, NULL, G_CONNECT_AFTER);
+  g_signal_connect_data (obj, "rows-reordered",
+                         (GCallback) moko_icon_view_accessible_model_rows_reordered, 
+                         icon_view, NULL, G_CONNECT_AFTER);
+}
+
+static void
+moko_icon_view_accessible_clear_cache (MokoIconViewAccessiblePrivate *priv)
+{
+  MokoIconViewItemAccessibleInfo *info;
+  GList *items;
+
+  items = priv->items;
+  while (items)
+    {
+      info = (MokoIconViewItemAccessibleInfo *) items->data;
+      g_object_unref (info->item);
+      g_free (items->data);
+      items = items->next;
+    }
+  g_list_free (priv->items);
+  priv->items = NULL;
+}
+
+static void
+moko_icon_view_accessible_notify_gtk (GObject *obj,
+                                     GParamSpec *pspec)
+{
+  MokoIconView *icon_view;
+  GtkWidget *widget;
+  AtkObject *atk_obj;
+  MokoIconViewAccessible *view;
+  MokoIconViewAccessiblePrivate *priv;
+
+  if (strcmp (pspec->name, "model") == 0)
+    {
+      widget = GTK_WIDGET (obj); 
+      atk_obj = gtk_widget_get_accessible (widget);
+      view = MOKO_ICON_VIEW_ACCESSIBLE (atk_obj);
+      priv = moko_icon_view_accessible_get_priv (atk_obj);
+      if (priv->model)
+        {
+          g_object_remove_weak_pointer (G_OBJECT (priv->model),
+                                        (gpointer *)&priv->model);
+          moko_icon_view_accessible_disconnect_model_signals (priv->model, widget);
+        }
+      moko_icon_view_accessible_clear_cache (priv);
+
+      icon_view = MOKO_ICON_VIEW (obj);
+      priv->model = icon_view->priv->model;
+      /* If there is no model the MokoIconView is probably being destroyed */
+      if (priv->model)
+        {
+          g_object_add_weak_pointer (G_OBJECT (priv->model), (gpointer *)&priv->model);
+          moko_icon_view_accessible_connect_model_signals (icon_view);
+        }
+    }
+
+  return;
+}
+
+static void
+moko_icon_view_accessible_initialize (AtkObject *accessible,
+                                     gpointer   data)
+{
+  MokoIconViewAccessiblePrivate *priv;
+  MokoIconView *icon_view;
+
+  if (ATK_OBJECT_CLASS (accessible_parent_class)->initialize)
+    ATK_OBJECT_CLASS (accessible_parent_class)->initialize (accessible, data);
+
+  priv = g_new0 (MokoIconViewAccessiblePrivate, 1);
+  g_object_set_qdata (G_OBJECT (accessible),
+                      accessible_private_data_quark,
+                      priv);
+
+  icon_view = MOKO_ICON_VIEW (data);
+  if (icon_view->priv->hadjustment)
+    {
+      priv->old_hadj = icon_view->priv->hadjustment;
+      g_object_add_weak_pointer (G_OBJECT (priv->old_hadj), (gpointer *)&priv->old_hadj);
+      g_signal_connect (icon_view->priv->hadjustment,
+                        "value-changed",
+                        G_CALLBACK (moko_icon_view_accessible_adjustment_changed),
+                        icon_view);
+    } 
+  if (icon_view->priv->vadjustment)
+    {
+      priv->old_vadj = icon_view->priv->vadjustment;
+      g_object_add_weak_pointer (G_OBJECT (priv->old_vadj), (gpointer *)&priv->old_vadj);
+      g_signal_connect (icon_view->priv->vadjustment,
+                        "value-changed",
+                        G_CALLBACK (moko_icon_view_accessible_adjustment_changed),
+                        icon_view);
+    }
+  g_signal_connect_after (data,
+                          "set_scroll_adjustments",
+                          G_CALLBACK (moko_icon_view_accessible_set_scroll_adjustments),
+                          NULL);
+  g_signal_connect (data,
+                    "notify",
+                    G_CALLBACK (moko_icon_view_accessible_notify_gtk),
+                    NULL);
+
+  priv->model = icon_view->priv->model;
+  if (priv->model)
+    {
+      g_object_add_weak_pointer (G_OBJECT (priv->model), (gpointer *)&priv->model);
+      moko_icon_view_accessible_connect_model_signals (icon_view);
+    }
+                          
+  accessible->role = ATK_ROLE_LAYERED_PANE;
+}
+
+static void
+moko_icon_view_accessible_finalize (GObject *object)
+{
+  MokoIconViewAccessiblePrivate *priv;
+
+  priv = moko_icon_view_accessible_get_priv (ATK_OBJECT (object));
+  moko_icon_view_accessible_clear_cache (priv);
+
+  g_free (priv);
+
+  G_OBJECT_CLASS (accessible_parent_class)->finalize (object);
+}
+
+static void
+moko_icon_view_accessible_destroyed (GtkWidget *widget,
+                                    GtkAccessible *accessible)
+{
+  AtkObject *atk_obj;
+  MokoIconViewAccessiblePrivate *priv;
+
+  atk_obj = ATK_OBJECT (accessible);
+  priv = moko_icon_view_accessible_get_priv (atk_obj);
+  if (priv->old_hadj)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (priv->old_hadj),
+                                    (gpointer *)&priv->old_hadj);
+          
+      g_signal_handlers_disconnect_by_func (priv->old_hadj,
+                                            (gpointer) moko_icon_view_accessible_adjustment_changed,
+                                            widget);
+      priv->old_hadj = NULL;
+    }
+  if (priv->old_vadj)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (priv->old_vadj),
+                                    (gpointer *)&priv->old_vadj);
+          
+      g_signal_handlers_disconnect_by_func (priv->old_vadj,
+                                            (gpointer) moko_icon_view_accessible_adjustment_changed,
+                                            widget);
+      priv->old_vadj = NULL;
+    }
+}
+
+static void
+moko_icon_view_accessible_connect_widget_destroyed (GtkAccessible *accessible)
+{
+  if (accessible->widget)
+    {
+      g_signal_connect_after (accessible->widget,
+                              "destroy",
+                              G_CALLBACK (moko_icon_view_accessible_destroyed),
+                              accessible);
+    }
+  GTK_ACCESSIBLE_CLASS (accessible_parent_class)->connect_widget_destroyed (accessible);
+}
+
+static void
+moko_icon_view_accessible_class_init (AtkObjectClass *klass)
+{
+  GObjectClass *gobject_class;
+  GtkAccessibleClass *accessible_class;
+
+  accessible_parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = (GObjectClass *)klass;
+  accessible_class = (GtkAccessibleClass *)klass;
+
+  gobject_class->finalize = moko_icon_view_accessible_finalize;
+
+  klass->get_n_children = moko_icon_view_accessible_get_n_children;
+  klass->ref_child = moko_icon_view_accessible_ref_child;
+  klass->initialize = moko_icon_view_accessible_initialize;
+
+  accessible_class->connect_widget_destroyed = moko_icon_view_accessible_connect_widget_destroyed;
+
+  accessible_private_data_quark = g_quark_from_static_string ("icon_view-accessible-private-data");
+}
+
+static AtkObject*
+moko_icon_view_accessible_ref_accessible_at_point (AtkComponent *component,
+                                                  gint          x,
+                                                  gint          y,
+                                                  AtkCoordType  coord_type)
+{
+  GtkWidget *widget;
+  MokoIconView *icon_view;
+  MokoIconViewItem *item;
+  gint x_pos, y_pos;
+
+  widget = GTK_ACCESSIBLE (component)->widget;
+  if (widget == NULL)
+  /* State is defunct */
+    return NULL;
+
+  icon_view = MOKO_ICON_VIEW (widget);
+  atk_component_get_extents (component, &x_pos, &y_pos, NULL, NULL, coord_type);
+  item = moko_icon_view_get_item_at_pos (icon_view, x - x_pos, y - y_pos);
+  if (item)
+    return moko_icon_view_accessible_ref_child (ATK_OBJECT (component), item->index);
+
+  return NULL;
+}
+
+static void
+atk_component_interface_init (AtkComponentIface *iface)
+{
+  iface->ref_accessible_at_point = moko_icon_view_accessible_ref_accessible_at_point;
+}
+
+static gboolean
+moko_icon_view_accessible_add_selection (AtkSelection *selection,
+                                        gint i)
+{
+  GtkWidget *widget;
+  MokoIconView *icon_view;
+  MokoIconViewItem *item;
+  GList *l;
+
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return FALSE;
+
+  icon_view = MOKO_ICON_VIEW (widget);
+
+  l = g_list_nth (icon_view->priv->items, i);
+  if (!l)
+    return FALSE;
+
+  item = l->data;
+  moko_icon_view_select_item (icon_view, item);
+
+  return TRUE;
+}
+
+static gboolean
+moko_icon_view_accessible_clear_selection (AtkSelection *selection)
+{
+  GtkWidget *widget;
+  MokoIconView *icon_view;
+
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return FALSE;
+
+  icon_view = MOKO_ICON_VIEW (widget);
+  moko_icon_view_unselect_all (icon_view);
+
+  return TRUE;
+}
+
+static AtkObject*
+moko_icon_view_accessible_ref_selection (AtkSelection *selection,
+                                        gint          i)
+{
+  GtkWidget *widget;
+  MokoIconView *icon_view;
+  MokoIconViewItem *item;
+  GList *l;
+
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return NULL;
+
+  icon_view = MOKO_ICON_VIEW (widget);
+
+  l = icon_view->priv->items;
+  while (l)
+    {
+      item = l->data;
+      if (item->selected)
+        {
+          if (i == 0)
+	    return atk_object_ref_accessible_child (gtk_widget_get_accessible (widget), item->index);
+          else
+            i--;
+        }
+      l = l->next;
+    }
+
+  return NULL;
+}
+
+static gint
+moko_icon_view_accessible_get_selection_count (AtkSelection *selection)
+{
+  GtkWidget *widget;
+  MokoIconView *icon_view;
+  MokoIconViewItem *item;
+  GList *l;
+  gint count;
+
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return 0;
+
+  icon_view = MOKO_ICON_VIEW (widget);
+
+  l = icon_view->priv->items;
+  count = 0;
+  while (l)
+    {
+      item = l->data;
+
+      if (item->selected)
+	count++;
+
+      l = l->next;
+    }
+
+  return count;
+}
+
+static gboolean
+moko_icon_view_accessible_is_child_selected (AtkSelection *selection,
+                                            gint          i)
+{
+  GtkWidget *widget;
+  MokoIconView *icon_view;
+  MokoIconViewItem *item;
+  GList *l;
+
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return FALSE;
+
+  icon_view = MOKO_ICON_VIEW (widget);
+  l = g_list_nth (icon_view->priv->items, i);
+  if (!l)
+    return FALSE;
+
+  item = l->data;
+
+  return item->selected;
+}
+
+static gboolean
+moko_icon_view_accessible_remove_selection (AtkSelection *selection,
+                                           gint          i)
+{
+  GtkWidget *widget;
+  MokoIconView *icon_view;
+  MokoIconViewItem *item;
+  GList *l;
+  gint count;
+
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return FALSE;
+
+  icon_view = MOKO_ICON_VIEW (widget);
+  l = icon_view->priv->items;
+  count = 0;
+  while (l)
+    {
+      item = l->data;
+      if (item->selected)
+        {
+          if (count == i)
+            {
+              moko_icon_view_unselect_item (icon_view, item);
+              return TRUE;
+            }
+          count++;
+        }
+      l = l->next;
+    }
+
+  return FALSE;
+}
+ 
+static gboolean
+moko_icon_view_accessible_select_all_selection (AtkSelection *selection)
+{
+  GtkWidget *widget;
+  MokoIconView *icon_view;
+
+  widget = GTK_ACCESSIBLE (selection)->widget;
+  if (widget == NULL)
+    return FALSE;
+
+  icon_view = MOKO_ICON_VIEW (widget);
+  moko_icon_view_select_all (icon_view);
+  return TRUE;
+}
+
+static void
+moko_icon_view_accessible_selection_interface_init (AtkSelectionIface *iface)
+{
+  iface->add_selection = moko_icon_view_accessible_add_selection;
+  iface->clear_selection = moko_icon_view_accessible_clear_selection;
+  iface->ref_selection = moko_icon_view_accessible_ref_selection;
+  iface->get_selection_count = moko_icon_view_accessible_get_selection_count;
+  iface->is_child_selected = moko_icon_view_accessible_is_child_selected;
+  iface->remove_selection = moko_icon_view_accessible_remove_selection;
+  iface->select_all_selection = moko_icon_view_accessible_select_all_selection;
+}
+
+static GType
+moko_icon_view_accessible_get_type (void)
+{
+  static GType type = 0;
+
+  if (!type)
+    {
+      static GTypeInfo tinfo =
+      {
+        0, /* class size */
+        (GBaseInitFunc) NULL, /* base init */
+        (GBaseFinalizeFunc) NULL, /* base finalize */
+        (GClassInitFunc) moko_icon_view_accessible_class_init,
+        (GClassFinalizeFunc) NULL, /* class finalize */
+        NULL, /* class data */
+        0, /* instance size */
+        0, /* nb preallocs */
+        (GInstanceInitFunc) NULL, /* instance init */
+        NULL /* value table */
+      };
+      static const GInterfaceInfo atk_component_info =
+      {
+        (GInterfaceInitFunc) atk_component_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+      static const GInterfaceInfo atk_selection_info = 
+      {
+        (GInterfaceInitFunc) moko_icon_view_accessible_selection_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+      };
+
+      /*
+       * Figure out the size of the class and instance
+       * we are deriving from
+       */
+      AtkObjectFactory *factory;
+      GType derived_type;
+      GTypeQuery query;
+      GType derived_atk_type;
+
+      derived_type = g_type_parent (MOKO_TYPE_ICON_VIEW);
+      factory = atk_registry_get_factory (atk_get_default_registry (), 
+                                          derived_type);
+      derived_atk_type = atk_object_factory_get_accessible_type (factory);
+      g_type_query (derived_atk_type, &query);
+      tinfo.class_size = query.class_size;
+      tinfo.instance_size = query.instance_size;
+ 
+      type = g_type_register_static (derived_atk_type, 
+                                     "MokoIconViewAccessible", 
+                                     &tinfo, 0);
+      g_type_add_interface_static (type, ATK_TYPE_COMPONENT,
+                                   &atk_component_info);
+      g_type_add_interface_static (type, ATK_TYPE_SELECTION,
+                                   &atk_selection_info);
+    }
+  return type;
+}
+
+static AtkObject *
+moko_icon_view_accessible_new (GObject *obj)
+{
+  AtkObject *accessible;
+
+  g_return_val_if_fail (GTK_IS_WIDGET (obj), NULL);
+
+  accessible = g_object_new (moko_icon_view_accessible_get_type (), NULL);
+  atk_object_initialize (accessible, obj);
+
+  return accessible;
+}
+
+static GType
+moko_icon_view_accessible_factory_get_accessible_type (void)
+{
+  return moko_icon_view_accessible_get_type ();
+}
+
+static AtkObject*
+moko_icon_view_accessible_factory_create_accessible (GObject *obj)
+{
+  return moko_icon_view_accessible_new (obj);
+}
+
+static void
+moko_icon_view_accessible_factory_class_init (AtkObjectFactoryClass *klass)
+{
+  klass->create_accessible = moko_icon_view_accessible_factory_create_accessible;
+  klass->get_accessible_type = moko_icon_view_accessible_factory_get_accessible_type;
+}
+
+static GType
+moko_icon_view_accessible_factory_get_type (void)
+{
+  static GType type = 0;
+
+  if (!type)
+    {
+      static const GTypeInfo tinfo =
+      {
+        sizeof (AtkObjectFactoryClass),
+        NULL,           /* base_init */
+        NULL,           /* base_finalize */
+        (GClassInitFunc) moko_icon_view_accessible_factory_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data */
+        sizeof (AtkObjectFactory),
+        0,             /* n_preallocs */
+        NULL, NULL
+      };
+
+      type = g_type_register_static (ATK_TYPE_OBJECT_FACTORY, 
+                                    "MokoIconViewAccessibleFactory",
+                                    &tinfo, 0);
+    }
+  return type;
+}
+
+static AtkObject *
+moko_icon_view_get_accessible (GtkWidget *widget)
+{
+  static gboolean first_time = TRUE;
+DEBUG("ICON VIEW GET ACCESSIBLE");
+  if (first_time)
+    {
+      AtkObjectFactory *factory;
+      AtkRegistry *registry;
+      GType derived_type; 
+      GType derived_atk_type; 
+
+      /*
+       * Figure out whether accessibility is enabled by looking at the
+       * type of the accessible object which would be created for
+       * the parent type of MokoIconView.
+       */
+      derived_type = g_type_parent (MOKO_TYPE_ICON_VIEW);
+
+      registry = atk_get_default_registry ();
+      factory = atk_registry_get_factory (registry,
+                                          derived_type);
+      derived_atk_type = atk_object_factory_get_accessible_type (factory);
+      if (g_type_is_a (derived_atk_type, GTK_TYPE_ACCESSIBLE)) 
+	atk_registry_set_factory_type (registry, 
+				       MOKO_TYPE_ICON_VIEW,
+				       moko_icon_view_accessible_factory_get_type ());
+      first_time = FALSE;
+    } 
+  return GTK_WIDGET_CLASS (parent_class)->get_accessible (widget);
+}
+

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.h	2006-12-19 17:45:01 UTC (rev 433)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/mokoiconview.h	2006-12-20 00:54:28 UTC (rev 434)
@@ -2,6 +2,10 @@
 #define _MOKO_ICON_VIEW_H__
 
 #include <gtk/gtk.h>
+#include <gtk/gtkmarshal.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkkeysyms.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 /*widgets property(s)*/
@@ -9,18 +13,19 @@
 #define ICON_WIDTH 		160
 
 #define MOKO_TYPE_ICON_VIEW				(moko_icon_view_get_type ())
-#define MOKO_ICON_VIEW(obj)				(G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_ICON_VIEW, MokoIconView))
-#define MOKO_ICON_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_ICON_VIEW, MokoIconViewClass))
+#define MOKO_ICON_VIEW(obj)				(GTK_CHECK_CAST ((obj), MOKO_TYPE_ICON_VIEW, MokoIconView))
+#define MOKO_ICON_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), MOKO_TYPE_ICON_VIEW, MokoIconViewClass))
 #define MOKO_IS_ICON_VIEW(obj)				(GTK_CHECK_TYPE ((obj), MOKO_TYPE_ICON_VIEW))
-#define MOKO_IS_ICON_VIEW_CLASS(klass)		(G_TYPE_CHECK_INSTANCE_CAST ((klass), MOKO_TYPE_ICON_VIEW))
-#define MOKO_ICON_VIEW_GET_CLASS(obj)    	(G_TYPE_CHECK_CLASS_CAST ((obj), MOKO_TYPE_ICON_VIEW, MokoIconViewClass))
+#define MOKO_IS_ICON_VIEW_CLASS(klass)		(GTK_CHECK_CAST ((klass), MOKO_TYPE_ICON_VIEW))
+#define MOKO_ICON_VIEW_GET_CLASS(obj)    	(GTK_CHECK_CLASS_CAST ((obj), MOKO_TYPE_ICON_VIEW, MokoIconViewClass))
 
 typedef struct _MokoIconView			MokoIconView;
 typedef struct _MokoIconViewClass      	MokoIconViewClass;
-//typedef struct _MokoIconViewPrivate    	MokoIconViewPrivate;
+typedef struct _MokoIconViewPrivate    	MokoIconViewPrivate;
+//typedef struct _GtkIconViewPrivate    	GtkIconViewPrivate;
 
 typedef void 
-(* MokoIconViewForeachFunc) (GtkIconView *icon_view, 
+(* MokoIconViewForeachFunc) (MokoIconView *icon_view, 
 						GtkTreePath *path, gpointer data);
 
 struct _MokoIconView 
@@ -28,21 +33,152 @@
   //GtkVBox vbox;
 
   //GtkWidget *btns[3][3];
-  GtkIconView parent;
+  //GtkIconView parent;
+  GtkContainer parent;
+
+  //GtkIconViewPrivate *priv;
+  MokoIconViewPrivate *priv;
   
 };
 
 struct _MokoIconViewClass
 {
-  GtkIconViewClass parent_class;
+  //GtkIconViewClass parent_class;
+  GtkContainerClass parent_class;
 
   void(*moko_icon_view_function)(MokoIconView *self);
 
+  void    (* set_scroll_adjustments) (MokoIconView      *icon_view,
+				      GtkAdjustment    *hadjustment,
+				      GtkAdjustment    *vadjustment);
+  
+  void    (* item_activated)         (MokoIconView      *icon_view,
+				      GtkTreePath      *path);
+  void    (* selection_changed)      (MokoIconView      *icon_view);
+
+  /* Key binding signals */
+  void    (* select_all)             (MokoIconView      *icon_view);
+  void    (* unselect_all)           (MokoIconView      *icon_view);
+  void    (* select_cursor_item)     (MokoIconView      *icon_view);
+  void    (* toggle_cursor_item)     (MokoIconView      *icon_view);
+  gboolean (* move_cursor)           (MokoIconView      *icon_view,
+				      GtkMovementStep   step,
+				      gint              count);
+  gboolean (* activate_cursor_item)  (MokoIconView      *icon_view);
+
+
+
 };
 
-GType 
-moko_icon_view_get_type (void);
+GType      
+moko_icon_view_get_type (void) ;
 
+GtkWidget *
+moko_icon_view_new (void);
+
+GtkWidget *
+moko_icon_view_new_with_model (GtkTreeModel *model);
+
+void
+moko_icon_view_set_model (MokoIconView  *icon_view, GtkTreeModel *model);
+
+GtkTreeModel *
+moko_icon_view_get_model (MokoIconView *icon_view);
+
+void
+moko_icon_view_set_text_column (MokoIconView *icon_view, gint column);
+
+gint          
+moko_icon_view_get_text_column (MokoIconView *icon_view);
+
+void
+moko_icon_view_set_markup_column (MokoIconView *icon_view, gint column);
+
+gint 
+moko_icon_view_get_markup_column (MokoIconView  *icon_view);
+
+void 
+moko_icon_view_set_pixbuf_column (MokoIconView  *icon_view, gint column);
+
+gint
+moko_icon_view_get_pixbuf_column (MokoIconView *icon_view);
+
+void
+moko_icon_view_set_orientation (MokoIconView *icon_view, GtkOrientation orientation);
+
+GtkOrientation 
+moko_icon_view_get_orientation (MokoIconView *icon_view);
+
+void
+moko_icon_view_set_columns (MokoIconView *icon_view, gint columns);
+
+gint
+moko_icon_view_get_columns (MokoIconView *icon_view);
+
+void
+moko_icon_view_set_item_width (MokoIconView *icon_view, gint item_width);
+
+gint
+moko_icon_view_get_item_width (MokoIconView *icon_view);
+
+void
+moko_icon_view_set_spacing (MokoIconView *icon_view, gint spacing);
+
+gint
+moko_icon_view_get_spacing (MokoIconView *icon_view);
+
+void
+moko_icon_view_set_row_spacing (MokoIconView *icon_view, gint row_spacing);
+
+gint
+moko_icon_view_get_row_spacing (MokoIconView *icon_view);
+
+void
+moko_icon_view_set_column_spacing (MokoIconView *icon_view, gint column_spacing);
+
+gint 
+moko_icon_view_get_column_spacing (MokoIconView *icon_view);
+
+void
+moko_icon_view_set_margin (MokoIconView *icon_view, gint margin);
+
+gint
+moko_icon_view_get_margin (MokoIconView *icon_view);
+
+GtkTreePath *
+moko_icon_view_get_path_at_pos (MokoIconView *icon_view, gint x, gint y);
+
+void
+moko_icon_view_selected_foreach (MokoIconView *icon_view, 
+					MokoIconViewForeachFunc  func, gpointer data);
+
+void
+moko_icon_view_set_selection_mode (MokoIconView *icon_view, GtkSelectionMode mode);
+
+GtkSelectionMode 
+moko_icon_view_get_selection_mode (MokoIconView *icon_view);
+
+void 
+moko_icon_view_select_path (MokoIconView *icon_view, GtkTreePath *path);
+
+void
+moko_icon_view_unselect_path (MokoIconView *icon_view, GtkTreePath *path);
+
+gboolean
+moko_icon_view_path_is_selected (MokoIconView *icon_view, GtkTreePath *path);
+
+GList *
+moko_icon_view_get_selected_items (MokoIconView *icon_view);
+
+void
+moko_icon_view_select_all (MokoIconView *icon_view);
+
+void
+moko_icon_view_unselect_all (MokoIconView *icon_view);
+
+void 
+moko_icon_view_item_activated (MokoIconView *icon_view, GtkTreePath *path);
+
 G_END_DECLS
 
 #endif /* mokoiconview.h */

Modified: trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c	2006-12-19 17:45:01 UTC (rev 433)
+++ trunk/src/target/OM-2007/applications/openmoko-mainmenu/src/support.c	2006-12-20 00:54:28 UTC (rev 434)
@@ -19,11 +19,7 @@
 
 #include "support.h"
 
-#include <string.h>
-#include <gtk/gtk.h>
-#include <glib.h>
-#include <gdk/gdk.h>
-#include <glib-object.h>
+#include <libmokoui/moko-pixmap-button.h>
 
  
  /**
@@ -42,23 +38,19 @@
     GdkPixbuf *pixbuf;
 
     gtk_list_store_append (store, &iter);
-    pixbuf = gdk_pixbuf_new_from_file_at_size (icon_path, ICON_SIZE_W, ICON_SIZE_H, NULL);// ADD Gerro handle later
+    pixbuf = gdk_pixbuf_new_from_file_at_size (icon_path, PIXBUF_WIDTH, PIXBUF_HEIGHT, NULL);// ADD Gerro handle later
 
     gtk_list_store_set (store, &iter, PIXBUF_COLUMN, pixbuf, TEXT_COLUMN, icon_name, -1);
     g_object_unref (pixbuf);
 
     return TRUE;
 }
-
+/*test code, delete later*/
 void 
 moko_sample_model_fill(GtkListStore *store) {
-    moko_fill_model(store,"/usr/share/pixmaps/abiword.png","abiword");
+    moko_fill_model(store,"/usr/share/pixmaps/abiword.png","1234567890123456789");
     moko_fill_model(store,"/usr/share/pixmaps/anjuta.xpm","anjuta");
     moko_fill_model(store,"/usr/share/pixmaps/anjuta.xpm","anjuta");
-    moko_fill_model(store,"/usr/share/pixmaps/anjuta.xpm","anjuta");
-    moko_fill_model(store,"/usr/share/pixmaps/anjuta.xpm","anjuta");
-    moko_fill_model(store,"/usr/share/pixmaps/anjuta.xpm","anjuta");
-    moko_fill_model(store,"/usr/share/pixmaps/anjuta.xpm","anjuta");
     moko_fill_model(store,"/usr/share/pixmaps/battstat.png","battstat");
     moko_fill_model(store,"/usr/share/pixmaps/gdm.png","gdm");
     moko_fill_model(store,"/usr/share/pixmaps/gdm-setup.png","gdm-setup");
@@ -67,7 +59,18 @@
     moko_fill_model(store,"/usr/share/pixmaps/gdm.xpm","gdm");
 }
 
+/*test code, delete later*/
 void
+moko_sample_hisory_app_fill(MokoPixmapButton *btn)
+{
+   GtkWidget *image;
+
+   image = gtk_image_new_from_file ("/usr/share/pixmaps/gdm.png");
+
+   moko_pixmap_button_set_finger_toolbox_btn_center_image(btn, image);
+}
+
+void
 moko_set_label_content(GtkLabel *label, const char *content) {
     if (label)
     	  gtk_label_set_text (label, content);





More information about the commitlog mailing list