Update the application menu flag for application-wise windows

[hildon] / examples / hildon-picker-button-multicolumn-example.c

diff --git a/examples/hildon-picker-button-multicolumn-example.c b/examples/hildon-picker-button-multicolumn-example.c
index 1d8c752..fdf9ace 100644 (file)
--- a/examples/hildon-picker-button-multicolumn-example.c
+++ b/examples/hildon-picker-button-multicolumn-example.c
@@ -14,20 +14,17 @@
  *
  */
 
-#include <glib.h>
-#include <gtk/gtk.h>
+#include                                        <glib.h>
+#include                                        <gtk/gtk.h>
+#include                                        <hildon/hildon.h>
 
-#include "hildon-program.h"
-#include "hildon-stackable-window.h"
-
-#include "hildon-picker-button.h"
-
-GtkWidget *
+static GtkWidget *
 create_touch_selector (void)
 {
   GtkWidget *selector;
   GtkListStore *model;
   GtkTreeIter iter;
+  HildonTouchSelectorColumn *column = NULL;
 
   selector = hildon_touch_selector_new ();
 
@@ -45,8 +42,9 @@ create_touch_selector (void)
   gtk_list_store_append (model, &iter);
   gtk_list_store_set (model, &iter, 0, "Mailbox", -1);
 
-  hildon_touch_selector_append_text_column (HILDON_TOUCH_SELECTOR (selector),
-                                            GTK_TREE_MODEL (model), TRUE);
+  column = hildon_touch_selector_append_text_column (HILDON_TOUCH_SELECTOR (selector),
+                                                     GTK_TREE_MODEL (model), TRUE);
+  hildon_touch_selector_column_set_text_column (column, 0);
 
   model = gtk_list_store_new (1, G_TYPE_STRING);
 
@@ -59,8 +57,10 @@ create_touch_selector (void)
   gtk_list_store_append (model, &iter);
   gtk_list_store_set (model, &iter, 0, "Smoke signals", -1);
 
-  hildon_touch_selector_append_text_column (HILDON_TOUCH_SELECTOR (selector),
-                                            GTK_TREE_MODEL (model), TRUE);
+  column = hildon_touch_selector_append_text_column (HILDON_TOUCH_SELECTOR (selector),
+                                                     GTK_TREE_MODEL (model), TRUE);
+  hildon_touch_selector_column_set_text_column (column, 0);
+  
   return selector;
 }
 
@@ -72,14 +72,14 @@ on_picker_value_changed (HildonPickerButton * button, gpointer data)
 }
 
 int
-main (int argc, char **args)
+main (int argc, char **argv)
 {
   HildonProgram *program = NULL;
   GtkWidget *window = NULL;
   GtkWidget *button;
   GtkWidget *selector;
 
-  gtk_init (&argc, &args);
+  hildon_gtk_init (&argc, &argv);
 
   program = hildon_program_get_instance ();
   g_set_application_name ("hildon-picker-button-example");
@@ -89,7 +89,10 @@ main (int argc, char **args)
   hildon_program_add_window (program, HILDON_WINDOW (window));
   selector = create_touch_selector ();
 
-  button = hildon_picker_button_new (HILDON_BUTTON_WITH_VERTICAL_VALUE);
+  button = hildon_picker_button_new (HILDON_SIZE_AUTO, HILDON_BUTTON_ARRANGEMENT_VERTICAL);
+  hildon_picker_button_set_done_button_text (HILDON_PICKER_BUTTON (button),
+                                             "We are done");
+
   hildon_button_set_title (HILDON_BUTTON (button), "Protocol");
   hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (button),
                                      HILDON_TOUCH_SELECTOR (selector));