Release 2.1.96-6

[hildon] / examples / hildon-touch-selector-example.c

diff --git a/examples/hildon-touch-selector-example.c b/examples/hildon-touch-selector-example.c
index 5e07bfa..695688b 100644 (file)
--- a/examples/hildon-touch-selector-example.c
+++ b/examples/hildon-touch-selector-example.c
@@ -21,15 +21,9 @@
  *
  */
 
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include "hildon-program.h"
-#include "hildon-stackable-window.h"
-
-#include "hildon-touch-selector.h"
-#include "hildon-picker-dialog.h"
-#include "hildon-picker-button.h"
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        <hildon/hildon.h>
 
 static GtkWidget *create_selector ();
 static GtkWidget *get_visible_content (GtkWidget * window);
@@ -59,6 +53,7 @@ create_selector ()
   GtkListStore *store_icons = NULL;
   GSList *item = NULL;
   GtkCellRenderer *renderer = NULL;
+  HildonTouchSelectorColumn *column = NULL;
 
   selector = hildon_touch_selector_new ();
 
@@ -78,9 +73,10 @@ create_selector ()
   renderer = gtk_cell_renderer_pixbuf_new ();
   gtk_cell_renderer_set_fixed_size (renderer, -1, 100);
 
-  hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector),
-                                       GTK_TREE_MODEL (store_icons),
-                                       renderer, "stock-id", 0, NULL);
+  column = hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector),
+                                                GTK_TREE_MODEL (store_icons),
+                                                renderer, "stock-id", 0, NULL);
+  hildon_touch_selector_column_set_text_column (column, 0);
 
   hildon_touch_selector_set_column_selection_mode (HILDON_TOUCH_SELECTOR (selector),
                                                    HILDON_TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE);
@@ -115,12 +111,12 @@ get_visible_content (GtkWidget * window)
 }
 
 int
-main (int argc, char **args)
+main (int argc, char **argv)
 {
   HildonProgram *program = NULL;
   GtkWidget *window = NULL;
 
-  gtk_init (&argc, &args);
+  hildon_gtk_init (&argc, &argv);
 
   program = hildon_program_get_instance ();
   g_set_application_name
@@ -132,11 +128,6 @@ main (int argc, char **args)
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 6);
 
-  gtk_rc_parse_string ("style \"fremantle-widget\" {\n"
-                       " GtkWidget::hildon-mode = 1 \n"
-                       "} widget \"*.fremantle-widget\" style \"fremantle-widget\"\n");
-
-
   GtkWidget *vbox = get_visible_content (window);
 
   gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (vbox));