From e6baec73969c6b6f56dde8cff16b10c083e3081e Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Wed, 4 Nov 2009 13:39:53 +0100 Subject: [PATCH] Also validating entry should be GtkEntry/HildonEntry --- src/widgets/modest-validating-entry.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/widgets/modest-validating-entry.c b/src/widgets/modest-validating-entry.c index 1515f7f..22c6c56 100644 --- a/src/widgets/modest-validating-entry.c +++ b/src/widgets/modest-validating-entry.c @@ -37,11 +37,14 @@ #include #endif +#ifndef MODEST_TOOLKIT_HILDON2 +#define USE_GTK_ENTRY +#endif -#ifdef MODEST_TOOLKIT_HILDON2 -G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, HILDON_TYPE_ENTRY); -#else +#ifdef USE_GTK_ENTRY G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, GTK_TYPE_ENTRY); +#else +G_DEFINE_TYPE (ModestValidatingEntry, modest_validating_entry, HILDON_TYPE_ENTRY); #endif #define VALIDATING_ENTRY_GET_PRIVATE(o) \ @@ -237,7 +240,7 @@ modest_validating_entry_new (void) entry = g_object_new (MODEST_TYPE_VALIDATING_ENTRY, NULL); -#ifdef MODEST_TOOLKIT_HILDON2 +#ifndef MODEST_TOOLKIT_HILDON2 hildon_gtk_widget_set_theme_size (GTK_WIDGET (entry), MODEST_EDITABLE_SIZE); #endif -- 1.7.9.5