diff options
| author | Anatoly Spektor <aspektor@redhat.com> | 2012-08-28 13:56:34 -0400 |
|---|---|---|
| committer | Anatoly Spektor <aspektor@redhat.com> | 2012-08-28 13:56:34 -0400 |
| commit | 7ac2d15e081f50dc81d21e4d632f358a2190c759 (patch) | |
| tree | a4e258dbaef0a69479ffc0c0d624ec0c1f98b264 | |
| parent | 97be2e59da48ecf0ac05d0b55b7e587b8dd04bb7 (diff) | |
| parent | 9298b2b5e4c70841e967d5ebec2fff49d69edcf8 (diff) | |
| download | eclipse.platform.swt-7ac2d15e081f50dc81d21e4d632f358a2190c759.tar.gz eclipse.platform.swt-7ac2d15e081f50dc81d21e4d632f358a2190c759.tar.xz eclipse.platform.swt-7ac2d15e081f50dc81d21e4d632f358a2190c759.zip | |
Merge branch 'master' of http://git.eclipse.org/gitroot/platform/eclipse.platform.swt.git
3 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak index 2e407471f5..2616a84548 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak @@ -14,6 +14,7 @@ include make_common.mak SWT_VERSION=$(maj_ver)$(min_ver) +GTK_VERSION?=2.0 # Define the various shared libraries to be build. WS_PREFIX = gtk @@ -47,16 +48,16 @@ CAIROCFLAGS = `pkg-config --cflags cairo` CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) -GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-x11-2.0 -lgthread-2.0 -lXtst +GTKCFLAGS = `pkg-config --cflags gtk+-$(GTK_VERSION)` +GTKLIBS = `pkg-config --libs-only-L gtk+-$(GTK_VERSION) gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lgtk-x11-$(GTK_VERSION) -lgthread-2.0 -lXtst CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc AWT_LFLAGS = -shared ${SWT_LFLAGS} AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` -ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 +ATKCFLAGS = `pkg-config --cflags atk gtk+-$(GTK_VERSION)` +ATKLIBS = `pkg-config --libs-only-L atk gtk+-$(GTK_VERSION)` -latk-1.0 -lgtk-x11-$(GTK_VERSION) GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c index 12cff6d853..16ad4e8134 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c @@ -5767,12 +5767,12 @@ JNIEXPORT void JNICALL OS_NATIVE(_1gdk_1pango_1context_1set_1colormap) { OS_NATIVE_ENTER(env, that, _1gdk_1pango_1context_1set_1colormap_FUNC); /* - gdk_pango_context_set_colormap((PangoContext *)arg0, (GdkColormap *)arg1); + gdk_pango_context_set_colormap((PangoContext *)arg0, arg1); */ { OS_LOAD_FUNCTION(fp, gdk_pango_context_set_colormap) if (fp) { - ((void (CALLING_CONVENTION*)(PangoContext *, GdkColormap *))fp)((PangoContext *)arg0, (GdkColormap *)arg1); + ((void (CALLING_CONVENTION*)(PangoContext *, jintLong))fp)((PangoContext *)arg0, arg1); } } OS_NATIVE_EXIT(env, that, _1gdk_1pango_1context_1set_1colormap_FUNC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java index 312603a2b1..c0ae254c02 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java @@ -4349,7 +4349,6 @@ public static final int /*long*/ gdk_pango_context_get() { /** * @method flags=dynamic * @param context cast=(PangoContext *) - * @param colormap cast=(GdkColormap *) */ public static final native void _gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap); public static final void gdk_pango_context_set_colormap(int /*long*/ context, int /*long*/ colormap) { |