aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2011-11-14 22:46:16 +0100
committerTomasz Sterna <tomek@xiaoka.com>2011-11-14 22:46:16 +0100
commit6cdb832c76ae0d8a71c8e874265bad8858b57794 (patch)
tree6f76809720c56d2312f2e72b02f9abbce09bea71
parent40ca65c7d81d83d38a82aa5839f9707cafc73943 (diff)
Merged setplaceholdertext.patch
-rw-r--r--examples/hildon-wizard-dialog-example.c2
-rw-r--r--hildon/hildon-entry.c2
-rw-r--r--hildon/hildon-text-view.c2
3 files changed, 6 insertions, 0 deletions
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
}
/**