From f5bbfe3fdda9846d37e1566349c7153a18ad458f Mon Sep 17 00:00:00 2001 From: Anatoly Spektor Date: Wed, 1 Aug 2012 15:51:54 -0400 Subject: Solve build errors regarding 2 GTK_TOOLTIPS constants --- bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h index f21e8ca75a..f5835515d9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h @@ -366,8 +366,16 @@ #define GTK_ENTRY_IM_CONTEXT(arg0) (arg0)->im_context #define GTK_TEXTVIEW_IM_CONTEXT(arg0) (arg0)->im_context #define GTK_TOOLTIPS_TIP_WINDOW(arg0) (arg0)->tip_window +#if GTK_CHECK_VERSION(2,12,0) +#define GTK_TOOLTIPS_SET_ACTIVE(arg0, arg1) +#else #define GTK_TOOLTIPS_SET_ACTIVE(arg0, arg1) (arg0)->active_tips_data = arg1 +#endif +#if GTK_CHECK_VERSION(2,12,0) +#define GTK_TOOLTIPS_GET_TIP_TEXT(arg0) 0 +#else #define GTK_TOOLTIPS_GET_TIP_TEXT(arg0) (arg0)->tip_text +#endif #define GTK_WIDGET_Y(arg0) ((GtkWidget *)arg0)->allocation.y #define GTK_WIDGET_SET_Y(arg0, arg1) (arg0)->allocation.y = arg1 #define GTK_WIDGET_REQUISITION_WIDTH(arg0) (arg0)->requisition.width -- cgit