diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-08-03 12:04:25 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2012-08-03 12:04:25 -0400 |
| commit | d47355702acdef06640d631533517b1f7a3bfe38 (patch) | |
| tree | 203d2eaf8033af4ad0204370d6774045b9286a82 | |
| parent | 5983c24ed5237e3fc3d1e8e4c23d3ce4ce153bac (diff) | |
| download | eclipse.platform.swt-d47355702acdef06640d631533517b1f7a3bfe38.tar.gz eclipse.platform.swt-d47355702acdef06640d631533517b1f7a3bfe38.tar.xz eclipse.platform.swt-d47355702acdef06640d631533517b1f7a3bfe38.zip | |
fix unmerged code
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h | 3 |
1 files changed, 1 insertions, 2 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 19f89145b3..d90076cca8 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 @@ -376,10 +376,9 @@ #endif #ifndef GTK_WIDGET_SENSITIVE #define GTK_WIDGET_SENSITIVE(arg0) 0 -======= +#endif #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 |