HildonTouchSelector documentation updates
[hildon] / examples / hildon-pannable-area-touch-grid-example.c
index ed36d74..02afb5b 100644 (file)
@@ -24,8 +24,8 @@
  *
  */
 
-#include <gtk/gtk.h>
-#include <hildon-pannable-area.h>
+#include                                        <gtk/gtk.h>
+#include                                        <hildon/hildon.h>
 
 enum
 {
@@ -70,12 +70,19 @@ create_icon_view (HildonUIMode  mode,
 {
   GtkWidget *icon_view;
   GtkCellRenderer *renderer;
+  GtkTreeModel *model;
 
-  icon_view = g_object_new (GTK_TYPE_ICON_VIEW,
-                            "model", create_model (),
-                            "name", name,
-                            "hildon-ui-mode", mode,
-                            NULL);
+  if (name && g_str_equal (name, "fremantle-widget"))
+      icon_view = hildon_gtk_icon_view_new (mode);
+  else
+      icon_view = gtk_icon_view_new ();
+
+  if (name)
+    gtk_widget_set_name (icon_view, name);
+
+  model = create_model ();
+  gtk_icon_view_set_model (GTK_ICON_VIEW (icon_view), model);
+  g_object_unref (model);
 
   if (multi_select)
     gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
@@ -156,11 +163,7 @@ main (int argc, char **argv)
   GtkWidget *padbox;
   GtkWidget *button;
 
-  gtk_init (&argc, &argv);
-
-  gtk_rc_parse_string ("style \"fremantle-widget\" {\n"
-                       "  GtkWidget::hildon-mode = 1\n"
-                       "} widget \"*.fremantle-widget\" style \"fremantle-widget\"");
+  hildon_gtk_init (&argc, &argv);
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   g_signal_connect (window, "delete-event",