projects
/
hildon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation updates
[hildon]
/
examples
/
hildon-touch-selector-multi-cells-example.c
diff --git
a/examples/hildon-touch-selector-multi-cells-example.c
b/examples/hildon-touch-selector-multi-cells-example.c
index
30fa2fe
..
b66a111
100644
(file)
--- a/
examples/hildon-touch-selector-multi-cells-example.c
+++ b/
examples/hildon-touch-selector-multi-cells-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);
static GtkWidget *create_selector ();
static GtkWidget *get_visible_content (GtkWidget * window);
@@
-83,7
+77,7
@@
create_selector ()
column = hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector),
GTK_TREE_MODEL (store_icons),
NULL, NULL);
column = hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector),
GTK_TREE_MODEL (store_icons),
NULL, NULL);
- g_object_set (G_OBJECT(column), "text-column", 1, NULL);
+ hildon_touch_selector_column_set_text_column (column, 1);
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_cell_renderer_set_fixed_size (renderer, 75, 75);
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_cell_renderer_set_fixed_size (renderer, 75, 75);
@@
-130,12
+124,12
@@
get_visible_content (GtkWidget * window)
}
int
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
HildonProgram *program = NULL;
GtkWidget *window = NULL;
{
HildonProgram *program = NULL;
GtkWidget *window = NULL;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
g_set_application_name
program = hildon_program_get_instance ();
g_set_application_name
@@
-147,11
+141,6
@@
main (int argc, char **args)
gtk_container_set_border_width (GTK_CONTAINER (window), 6);
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));
GtkWidget *vbox = get_visible_content (window);
gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (vbox));