diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h | 9 |
1 files changed, 9 insertions, 0 deletions
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 0a5fd5fe20..19f89145b3 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 @@ -206,6 +206,10 @@ #define gtk_fixed_set_has_window_LIB LIB_GTK #define gtk_widget_get_mapped_LIB LIB_GTK #define gtk_widget_get_sensitive_LIB LIB_GTK +#define gtk_widget_get_has_window_LIB LIB_GTK +#define gtk_widget_get_visible_LIB LIB_GTK +#define gtk_widget_get_realized_LIB LIB_GTK +#define gtk_widget_get_can_default_LIB LIB_GTK #define gdk_pango_context_set_colormap_LIB LIB_GDK #define gdk_x11_screen_get_window_manager_name_LIB LIB_GDK #define gdk_x11_screen_lookup_visual_LIB LIB_GDK @@ -366,11 +370,16 @@ #else #define GTK_SCROLLED_WINDOW_VSCROLLBAR(arg0) (arg0)->vscrollbar #endif +<<<<<<< HEAD #ifndef GTK_WIDGET_HAS_DEFAULT #define GTK_WIDGET_HAS_DEFAULT(arg0) 0 #endif #ifndef GTK_WIDGET_SENSITIVE #define GTK_WIDGET_SENSITIVE(arg0) 0 +======= +#ifndef GTK_OBJECT_FLAGS +#define GTK_OBJECT_FLAGS(arg0) 0 +>>>>>>> 4bf36e6... Omit use of deprecated GTK_WIDGET_FLAGS #endif #define GTK_WIDGET_HEIGHT(arg0) (arg0)->allocation.height #define GTK_WIDGET_SET_HEIGHT(arg0, arg1) (arg0)->allocation.height = arg1 |