projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better error checking inserting images in editor
[modest]
/
src
/
widgets
/
modest-validating-entry.h
diff --git
a/src/widgets/modest-validating-entry.h
b/src/widgets/modest-validating-entry.h
index
e7c2bf6
..
f664289
100644
(file)
--- a/
src/widgets/modest-validating-entry.h
+++ b/
src/widgets/modest-validating-entry.h
@@
-6,7
+6,11
@@
#ifndef _MODEST_VALIDATING_ENTRY
#define _MODEST_VALIDATING_ENTRY
#ifndef _MODEST_VALIDATING_ENTRY
#define _MODEST_VALIDATING_ENTRY
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-entry.h>
+#else
#include <gtk/gtkentry.h>
#include <gtk/gtkentry.h>
+#endif
G_BEGIN_DECLS
G_BEGIN_DECLS
@@
-33,11
+37,19
@@
G_BEGIN_DECLS
MODEST_TYPE_VALIDATING_ENTRY, ModestValidatingEntryClass))
typedef struct {
MODEST_TYPE_VALIDATING_ENTRY, ModestValidatingEntryClass))
typedef struct {
+#ifdef MODEST_TOOLKIT_HILDON2
+ HildonEntry parent;
+#else
GtkEntry parent;
GtkEntry parent;
+#endif
} ModestValidatingEntry;
typedef struct {
} ModestValidatingEntry;
typedef struct {
+#ifdef MODEST_TOOLKIT_HILDON2
+ HildonEntryClass parent_class;
+#else
GtkEntryClass parent_class;
GtkEntryClass parent_class;
+#endif
} ModestValidatingEntryClass;
GType modest_validating_entry_get_type (void);
} ModestValidatingEntryClass;
GType modest_validating_entry_get_type (void);
@@
-47,6
+59,9
@@
ModestValidatingEntry* modest_validating_entry_new (void);
void modest_validating_entry_set_unallowed_characters (ModestValidatingEntry *self, GList *list);
void modest_validating_entry_set_unallowed_characters_whitespace (ModestValidatingEntry *self);
void modest_validating_entry_set_unallowed_characters (ModestValidatingEntry *self, GList *list);
void modest_validating_entry_set_unallowed_characters_whitespace (ModestValidatingEntry *self);
+typedef void (* EasySetupValidatingEntryFunc) (ModestValidatingEntry *self, const gchar* character, gpointer user_data);
+void modest_validating_entry_set_func (ModestValidatingEntry *self, EasySetupValidatingEntryFunc func, gpointer user_data);
+
typedef void (* EasySetupValidatingEntryMaxFunc) (ModestValidatingEntry *self, gpointer user_data);
void modest_validating_entry_set_max_func (ModestValidatingEntry *self, EasySetupValidatingEntryMaxFunc func, gpointer user_data);
typedef void (* EasySetupValidatingEntryMaxFunc) (ModestValidatingEntry *self, gpointer user_data);
void modest_validating_entry_set_max_func (ModestValidatingEntry *self, EasySetupValidatingEntryMaxFunc func, gpointer user_data);