forked from AuroraMiddleware/gtk
restore the else case of #ifdef __GNUC__ #66225
* gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__ #66225
This commit is contained in:
parent
9605ec8a03
commit
0657d7410b
@ -1,3 +1,8 @@
|
||||
Tue Dec 4 21:46:13 2001 HideToshi Tajima <hidetoshi.tajima@sun.com>
|
||||
|
||||
* gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
|
||||
#66225
|
||||
|
||||
2001-12-04 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkmain.c
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Dec 4 21:46:13 2001 HideToshi Tajima <hidetoshi.tajima@sun.com>
|
||||
|
||||
* gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
|
||||
#66225
|
||||
|
||||
2001-12-04 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkmain.c
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Dec 4 21:46:13 2001 HideToshi Tajima <hidetoshi.tajima@sun.com>
|
||||
|
||||
* gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
|
||||
#66225
|
||||
|
||||
2001-12-04 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkmain.c
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Dec 4 21:46:13 2001 HideToshi Tajima <hidetoshi.tajima@sun.com>
|
||||
|
||||
* gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
|
||||
#66225
|
||||
|
||||
2001-12-04 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkmain.c
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Dec 4 21:46:13 2001 HideToshi Tajima <hidetoshi.tajima@sun.com>
|
||||
|
||||
* gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
|
||||
#66225
|
||||
|
||||
2001-12-04 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkmain.c
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Dec 4 21:46:13 2001 HideToshi Tajima <hidetoshi.tajima@sun.com>
|
||||
|
||||
* gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
|
||||
#66225
|
||||
|
||||
2001-12-04 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkmain.c
|
||||
|
@ -1,3 +1,8 @@
|
||||
Tue Dec 4 21:46:13 2001 HideToshi Tajima <hidetoshi.tajima@sun.com>
|
||||
|
||||
* gtk/gtktreeprivate.h: restore the else case of #ifdef __GNUC__
|
||||
#66225
|
||||
|
||||
2001-12-04 Manish Singh <yosh@gimp.org>
|
||||
|
||||
* gtk/gtkmain.c
|
||||
|
@ -184,6 +184,8 @@ struct _GtkTreeViewPrivate
|
||||
GtkDestroyNotify search_destroy;
|
||||
};
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
||||
#define TREE_VIEW_INTERNAL_ASSERT(expr, ret) G_STMT_START{ \
|
||||
if (!(expr)) \
|
||||
{ \
|
||||
@ -218,6 +220,41 @@ struct _GtkTreeViewPrivate
|
||||
return; \
|
||||
}; }G_STMT_END
|
||||
|
||||
#else
|
||||
|
||||
#define TREE_VIEW_INTERNAL_ASSERT(expr, ret) G_STMT_START{ \
|
||||
if (!(expr)) \
|
||||
{ \
|
||||
g_log (G_LOG_DOMAIN, \
|
||||
G_LOG_LEVEL_CRITICAL, \
|
||||
"file %s: line %d: assertion `%s' failed.\n" \
|
||||
"There is a disparity between the internal view of the GtkTreeView,\n" \
|
||||
"and the GtkTreeModel. This generally means that the model has changed\n"\
|
||||
"without letting the view know. Any display from now on is likely to\n" \
|
||||
"be incorrect.\n", \
|
||||
__FILE__, \
|
||||
__LINE__, \
|
||||
#expr); \
|
||||
return ret; \
|
||||
}; }G_STMT_END
|
||||
|
||||
#define TREE_VIEW_INTERNAL_ASSERT_VOID(expr) G_STMT_START{ \
|
||||
if (!(expr)) \
|
||||
{ \
|
||||
g_log (G_LOG_DOMAIN, \
|
||||
G_LOG_LEVEL_CRITICAL, \
|
||||
"file %s: line %d: assertion '%s' failed.\n" \
|
||||
"There is a disparity between the internal view of the GtkTreeView,\n" \
|
||||
"and the GtkTreeModel. This generally means that the model has changed\n"\
|
||||
"without letting the view know. Any display from now on is likely to\n" \
|
||||
"be incorrect.\n", \
|
||||
__FILE__, \
|
||||
__LINE__, \
|
||||
#expr); \
|
||||
return; \
|
||||
}; }G_STMT_END
|
||||
#endif
|
||||
|
||||
|
||||
/* functions that shouldn't be exported */
|
||||
void _gtk_tree_selection_internal_select_node (GtkTreeSelection *selection,
|
||||
|
Loading…
Reference in New Issue
Block a user