X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=examples%2Fhildon-edit-toolbar-example.c;h=e8d156d2e1c48e2e06788ce7792aee9d84c9e76d;hb=4b7a3e775470d82b8ba2c5d896edbb8911aca2f0;hp=920fdeb8095d9de77e04f35213212b8bc5aa9d38;hpb=cd3d22e6cde6c7f09d93b54623a36b5d9b97a065;p=hildon

diff --git a/examples/hildon-edit-toolbar-example.c b/examples/hildon-edit-toolbar-example.c
index 920fdeb..e8d156d 100644
--- a/examples/hildon-edit-toolbar-example.c
+++ b/examples/hildon-edit-toolbar-example.c
@@ -21,7 +21,7 @@
  */
 
 #include                                        <gtk/gtk.h>
-#include                                        "hildon.h"
+#include                                        <hildon/hildon.h>
 
 typedef enum
 {
@@ -62,11 +62,20 @@ create_icon_view                                (TreeViewMode  tvmode)
 
   if (tvmode == NORMAL_MODE)
     {
+#ifdef MAEMO_GTK
       icon_view = hildon_gtk_icon_view_new (HILDON_UI_MODE_NORMAL);
+#else
+      icon_view = gtk_icon_view_new ();
+#endif /* MAEMO_GTK */
     }
   else
     {
+#ifdef MAEMO_GTK
       icon_view = hildon_gtk_icon_view_new (HILDON_UI_MODE_EDIT);
+#else
+      icon_view = gtk_icon_view_new ();
+#endif /* MAEMO_GTK */
+
       gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view),
                                         GTK_SELECTION_MULTIPLE);
     }
@@ -132,23 +141,20 @@ edit_window                                     (void)
 {
   GtkWidget *window;
   GtkWidget *iconview;
-  GtkWidget *vbox;
   GtkWidget *toolbar;
   GtkWidget *area;
 
   window = hildon_stackable_window_new ();
   gtk_container_set_border_width (GTK_CONTAINER (window), 6);
 
-  vbox = gtk_vbox_new (FALSE, 10);
   toolbar = hildon_edit_toolbar_new_with_text ("Choose items to delete", "Delete");
   area = hildon_pannable_area_new ();
   iconview = create_icon_view (EDIT_MODE);
 
-  gtk_container_add (GTK_CONTAINER (area), iconview);
-  gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), area, TRUE, TRUE, 0);
+  hildon_window_set_edit_toolbar (HILDON_WINDOW (window), HILDON_EDIT_TOOLBAR (toolbar));
 
-  gtk_container_add (GTK_CONTAINER (window), vbox);
+  gtk_container_add (GTK_CONTAINER (area), iconview);
+  gtk_container_add (GTK_CONTAINER (window), area);
 
   g_signal_connect (toolbar, "button-clicked", G_CALLBACK (delete_button_clicked), iconview);
   g_signal_connect_swapped (toolbar, "arrow-clicked", G_CALLBACK (gtk_widget_destroy), window);
@@ -167,11 +173,7 @@ main                                            (int    argc,
   GtkWidget *button;
   GtkWidget *area;
 
-  gtk_init (&argc, &argv);
-
-  gtk_rc_parse_string ("style \"fremantle-widget\" {\n"
-                       "  GtkWidget::hildon-mode = 1\n"
-                       "} class \"GtkIconView\" style \"fremantle-widget\"");
+  hildon_gtk_init (&argc, &argv);
 
   window = hildon_stackable_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);