aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-search-bar.h
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2002-11-07 12:52:05 +0800
committerChris Toshok <toshok@src.gnome.org>2002-11-07 12:52:05 +0800
commitb59fb51176c10c48865572b27d697c6cc51358d3 (patch)
tree71fbf1b2db990dda2316c7dd7d31024171b2160f /widgets/misc/e-search-bar.h
parentdaf38bc8b0643edaf1629f7767ddb3051821d000 (diff)
downloadgsoc2013-evolution-b59fb51176c10c48865572b27d697c6cc51358d3.tar.gz
gsoc2013-evolution-b59fb51176c10c48865572b27d697c6cc51358d3.tar.zst
gsoc2013-evolution-b59fb51176c10c48865572b27d697c6cc51358d3.zip
ignore the generated marshal source.
2002-11-06 Chris Toshok <toshok@ximian.com> * .cvsignore: ignore the generated marshal source. * Makefile.am: add marshal stuff. * e-util-marshal.list: marshaller list. * e-search-bar.[ch]: gobjectify this. svn path=/trunk/; revision=18627
Diffstat (limited to 'widgets/misc/e-search-bar.h')
-rw-r--r--widgets/misc/e-search-bar.h19
1 files changed, 7 insertions, 12 deletions
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index 7ca10c3890..b0333ad58b 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -24,10 +24,7 @@
#include <bonobo/bonobo-ui-component.h>
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
/* ESearchBar - A card displaying information about a contact.
*
@@ -41,10 +38,10 @@ extern "C" {
*/
#define E_SEARCH_BAR_TYPE (e_search_bar_get_type ())
-#define E_SEARCH_BAR(obj) (GTK_CHECK_CAST ((obj), E_SEARCH_BAR_TYPE, ESearchBar))
-#define E_SEARCH_BAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SEARCH_BAR_TYPE, ESearchBarClass))
-#define E_IS_SEARCH_BAR(obj) (GTK_CHECK_TYPE ((obj), E_SEARCH_BAR_TYPE))
-#define E_IS_SEARCH_BAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SEARCH_BAR_TYPE))
+#define E_SEARCH_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_SEARCH_BAR_TYPE, ESearchBar))
+#define E_SEARCH_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_SEARCH_BAR_TYPE, ESearchBarClass))
+#define E_IS_SEARCH_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_SEARCH_BAR_TYPE))
+#define E_IS_SEARCH_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_SEARCH_BAR_TYPE))
typedef struct {
char *text;
@@ -107,7 +104,7 @@ enum {
};
-GtkType e_search_bar_get_type (void);
+GType e_search_bar_get_type (void);
void e_search_bar_construct (ESearchBar *search_bar,
ESearchBarItem *menu_items,
ESearchBarItem *option_items);
@@ -148,9 +145,7 @@ void e_search_bar_set_text (ESearchBar *search_bar,
const char *text);
char *e_search_bar_get_text (ESearchBar *search_bar);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __E_SEARCH_BAR_H__ */