From 6cdb832c76ae0d8a71c8e874265bad8858b57794 Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Mon, 14 Nov 2011 22:46:16 +0100 Subject: Merged setplaceholdertext.patch --- examples/hildon-wizard-dialog-example.c | 2 ++ hildon/hildon-entry.c | 2 ++ hildon/hildon-text-view.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/examples/hildon-wizard-dialog-example.c b/examples/hildon-wizard-dialog-example.c index e542221..2e8b3c3 100644 --- a/examples/hildon-wizard-dialog-example.c +++ b/examples/hildon-wizard-dialog-example.c @@ -77,7 +77,9 @@ main (int argc, char **argv) GtkWidget *label_1 = gtk_label_new ("Page 1"); GtkWidget *label_2 = gtk_label_new ("Page 2"); GtkWidget *entry_3 = hildon_entry_new (HILDON_SIZE_AUTO); +#ifdef MAEMO_GTK hildon_gtk_entry_set_placeholder_text (GTK_ENTRY (entry_3), " Write something to continue"); +#endif GtkWidget *label_4 = gtk_label_new ("Page 4"); gtk_notebook_append_page (GTK_NOTEBOOK (notebook), label_1, NULL); diff --git a/hildon/hildon-entry.c b/hildon/hildon-entry.c index 5268586..2e32ca3 100644 --- a/hildon/hildon-entry.c +++ b/hildon/hildon-entry.c @@ -138,7 +138,9 @@ hildon_entry_set_placeholder (HildonEntry *entry, const gchar *text) { g_return_if_fail (HILDON_IS_ENTRY (entry) && text != NULL); +#ifdef MAEMO_GTK hildon_gtk_entry_set_placeholder_text (GTK_ENTRY (entry), text); +#endif } /** diff --git a/hildon/hildon-text-view.c b/hildon/hildon-text-view.c index 1d95f1c..8bb94ab 100644 --- a/hildon/hildon-text-view.c +++ b/hildon/hildon-text-view.c @@ -134,7 +134,9 @@ hildon_text_view_set_placeholder (HildonTextView *text_view, const gchar *text) { g_return_if_fail (HILDON_IS_TEXT_VIEW (text_view) && text != NULL); +#ifdef MAEMO_GTK hildon_gtk_text_view_set_placeholder_text (GTK_TEXT_VIEW (text_view), text); +#endif } /** -- cgit v1.2.3-18-g5258