#ifndef _MODEST_VALIDATING_ENTRY
#define _MODEST_VALIDATING_ENTRY
-#ifdef MODEST_TOOLKIT_HILDON2
+#ifndef MODEST_TOOLKIT_HILDON2
+#define USE_GTK_ENTRY
+#endif
+
+#ifndef USE_GTK_ENTRY
#include <hildon/hildon-entry.h>
#else
-#include <gtk/gtkentry.h>
+#include <gtk/gtk.h>
#endif
G_BEGIN_DECLS
MODEST_TYPE_VALIDATING_ENTRY, ModestValidatingEntryClass))
typedef struct {
-#ifdef MODEST_TOOLKIT_HILDON2
+#ifndef USE_GTK_ENTRY
HildonEntry parent;
#else
GtkEntry parent;
} ModestValidatingEntry;
typedef struct {
-#ifdef MODEST_TOOLKIT_HILDON2
+#ifndef USE_GTK_ENTRY
HildonEntryClass parent_class;
#else
GtkEntryClass parent_class;