*** empty log message ***

10 files changed, 122 insertions, 46 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gdkpixbuf.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gdkpixbuf.c
index f624fe3577..d62cf3a524 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gdkpixbuf.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gdkpixbuf.c
@@ -233,3 +233,9 @@ JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_GDKPIXBUF_gdk_1pixbuf_1
 	dest_x, dest_y,
 	width, height);
 }
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_GDKPIXBUF_GDK_1COLORSPACE_1RGB
+  (JNIEnv *env, jclass cl)
+{
+   return (jint)GDK_COLORSPACE_RGB;
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gtkwidget.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gtkwidget.c
index 48ca797abb..e5a63c1951 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gtkwidget.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gtkwidget.c
@@ -29,13 +29,18 @@ JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_GTK_1WIDGET_1TYPE
 	return GTK_WIDGET_TYPE((GtkWidget*)wid);
 }
 
-
 JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_GTK_1WIDGET_1FLAGS
   (JNIEnv *env, jclass that, jint wid)
 {
 	return (jint) GTK_WIDGET_FLAGS((GtkWidget*)wid);
 }
 
+JNIEXPORT jboolean JNICALL Java_org_eclipse_swt_internal_gtk_OS_GTK_1WIDGET_1HAS_1FOCUS
+  (JNIEnv *env, jclass that, jint wid)
+{
+	return (jboolean) GTK_WIDGET_HAS_FOCUS((GtkWidget*)wid);
+}
+
 /* Temporary code.  These private fields should not be accessed at all. */
 JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_GTK_1WIDGET_1WINDOW
   (JNIEnv *env, jclass that, jint wid)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gtkwindow.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gtkwindow.c
index 14b41a8943..f52afd19e3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gtkwindow.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-gtkwindow.c
@@ -67,8 +67,8 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_gtk_1window_1get_1po
   if (px) px1 = (*env)->GetIntArrayElements(env, px, NULL);
   if (py) py1 = (*env)->GetIntArrayElements(env, py, NULL);
   gtk_window_get_position((GtkWindow*)window, (gint*)px1, (gint*)py1);
-  if (px) (*env)->ReleaseByteArrayElements(env, px, px1, 0);
-  if (py) (*env)->ReleaseByteArrayElements(env, py, py1, 0);
+  if (px) (*env)->ReleaseIntArrayElements(env, px, px1, 0);
+  if (py) (*env)->ReleaseIntArrayElements(env, py, py1, 0);
 }
 
 JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_gtk_1window_1get_1size
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-memmove.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-memmove.c
index af1c7e2b70..6d35821c30 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-memmove.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-memmove.c
@@ -116,16 +116,6 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclips
 	}
 }
 
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclipse_swt_internal_gtk_GtkContainer_2I
-  (JNIEnv *env, jclass that, jobject dest, jint src)
-{
-	DECL_GLOB(pGlob)
-	if (dest) {
-		cacheGtkContainerFids(env, dest, &PGLOB(GtkContainerFc));
-		setGtkContainerFields(env, dest, src, &PGLOB(GtkContainerFc));
-	}
-}
-
 JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclipse_swt_internal_gtk_GtkRequisition_2I
   (JNIEnv *env, jclass that, jobject dest, jint src)
 {
@@ -146,16 +136,6 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclips
 	}
 }
 
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidget_2I
-  (JNIEnv *env, jclass that, jobject dest, jint src)
-{
-	DECL_GLOB(pGlob)
-	if (dest) {
-		cacheGtkWidgetFids(env, dest, &PGLOB(GtkWidgetFc));
-		setGtkWidgetFields(env, dest, src, &PGLOB(GtkWidgetFc));
-	}
-}
-
 JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I
   (JNIEnv *env, jclass that, jobject dest, jint src)
 {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-pango.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-pango.c
index 627b3f3db6..396f7b23c1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-pango.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/swt-pango.c
@@ -169,3 +169,50 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1font_1descrip
 {
    pango_font_description_set_weight((PangoFontDescription*)descr, weight);
 }
+
+/* contexts */
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1context_1new
+  (JNIEnv *env, jclass that)
+{
+   return (jint)pango_context_new();
+}
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1context_1get_1font_1description
+  (JNIEnv *env, jclass that, jint context)
+{
+   return (jint)pango_context_get_font_description((PangoContext*)context);
+}
+
+JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1context_1set_1font_1description
+  (JNIEnv *env, jclass that, jint context, jint descr)
+{
+   pango_context_set_font_description((PangoContext*)context, (PangoFontDescription*)descr);
+}
+
+JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1context_1get_1metrics
+  (JNIEnv *env, jclass that, jint context, jint descr)
+{
+   return (jint)pango_context_get_metrics((PangoContext*)context, (PangoFontDescription*)descr, NULL);
+}
+
+/* metrics */
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1font_1metrics_1get_1ascent
+  (JNIEnv *env, jclass that, jint metrics)
+{
+   return (jint)pango_font_metrics_get_ascent((PangoFontMetrics*)metrics);
+}
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1font_1metrics_1get_1descent
+  (JNIEnv *env, jclass that, jint metrics)
+{
+   return (jint)pango_font_metrics_get_descent((PangoFontMetrics*)metrics);
+}
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1font_1metrics_1get_1approximate_1char_1width
+  (JNIEnv *env, jclass that, jint metrics)
+{
+   return (jint)pango_font_metrics_get_approximate_char_width((PangoFontMetrics*)metrics);
+}
+
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gdkpixbuf.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gdkpixbuf.c
index f624fe3577..d62cf3a524 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gdkpixbuf.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gdkpixbuf.c
@@ -233,3 +233,9 @@ JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_GDKPIXBUF_gdk_1pixbuf_1
 	dest_x, dest_y,
 	width, height);
 }
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_GDKPIXBUF_GDK_1COLORSPACE_1RGB
+  (JNIEnv *env, jclass cl)
+{
+   return (jint)GDK_COLORSPACE_RGB;
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gtkwidget.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gtkwidget.c
index 48ca797abb..e5a63c1951 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gtkwidget.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gtkwidget.c
@@ -29,13 +29,18 @@ JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_GTK_1WIDGET_1TYPE
 	return GTK_WIDGET_TYPE((GtkWidget*)wid);
 }
 
-
 JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_GTK_1WIDGET_1FLAGS
   (JNIEnv *env, jclass that, jint wid)
 {
 	return (jint) GTK_WIDGET_FLAGS((GtkWidget*)wid);
 }
 
+JNIEXPORT jboolean JNICALL Java_org_eclipse_swt_internal_gtk_OS_GTK_1WIDGET_1HAS_1FOCUS
+  (JNIEnv *env, jclass that, jint wid)
+{
+	return (jboolean) GTK_WIDGET_HAS_FOCUS((GtkWidget*)wid);
+}
+
 /* Temporary code.  These private fields should not be accessed at all. */
 JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_GTK_1WIDGET_1WINDOW
   (JNIEnv *env, jclass that, jint wid)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gtkwindow.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gtkwindow.c
index 14b41a8943..f52afd19e3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gtkwindow.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-gtkwindow.c
@@ -67,8 +67,8 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_gtk_1window_1get_1po
   if (px) px1 = (*env)->GetIntArrayElements(env, px, NULL);
   if (py) py1 = (*env)->GetIntArrayElements(env, py, NULL);
   gtk_window_get_position((GtkWindow*)window, (gint*)px1, (gint*)py1);
-  if (px) (*env)->ReleaseByteArrayElements(env, px, px1, 0);
-  if (py) (*env)->ReleaseByteArrayElements(env, py, py1, 0);
+  if (px) (*env)->ReleaseIntArrayElements(env, px, px1, 0);
+  if (py) (*env)->ReleaseIntArrayElements(env, py, py1, 0);
 }
 
 JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_gtk_1window_1get_1size
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-memmove.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-memmove.c
index af1c7e2b70..6d35821c30 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-memmove.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-memmove.c
@@ -116,16 +116,6 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclips
 	}
 }
 
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclipse_swt_internal_gtk_GtkContainer_2I
-  (JNIEnv *env, jclass that, jobject dest, jint src)
-{
-	DECL_GLOB(pGlob)
-	if (dest) {
-		cacheGtkContainerFids(env, dest, &PGLOB(GtkContainerFc));
-		setGtkContainerFields(env, dest, src, &PGLOB(GtkContainerFc));
-	}
-}
-
 JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclipse_swt_internal_gtk_GtkRequisition_2I
   (JNIEnv *env, jclass that, jobject dest, jint src)
 {
@@ -146,16 +136,6 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclips
 	}
 }
 
-JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclipse_swt_internal_gtk_GtkWidget_2I
-  (JNIEnv *env, jclass that, jobject dest, jint src)
-{
-	DECL_GLOB(pGlob)
-	if (dest) {
-		cacheGtkWidgetFids(env, dest, &PGLOB(GtkWidgetFc));
-		setGtkWidgetFields(env, dest, src, &PGLOB(GtkWidgetFc));
-	}
-}
-
 JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclipse_swt_internal_gtk_GtkAdjustment_2I
   (JNIEnv *env, jclass that, jobject dest, jint src)
 {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-pango.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-pango.c
index 627b3f3db6..396f7b23c1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-pango.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt-pango.c
@@ -169,3 +169,50 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1font_1descrip
 {
    pango_font_description_set_weight((PangoFontDescription*)descr, weight);
 }
+
+/* contexts */
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1context_1new
+  (JNIEnv *env, jclass that)
+{
+   return (jint)pango_context_new();
+}
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1context_1get_1font_1description
+  (JNIEnv *env, jclass that, jint context)
+{
+   return (jint)pango_context_get_font_description((PangoContext*)context);
+}
+
+JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1context_1set_1font_1description
+  (JNIEnv *env, jclass that, jint context, jint descr)
+{
+   pango_context_set_font_description((PangoContext*)context, (PangoFontDescription*)descr);
+}
+
+JNIEXPORT int JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1context_1get_1metrics
+  (JNIEnv *env, jclass that, jint context, jint descr)
+{
+   return (jint)pango_context_get_metrics((PangoContext*)context, (PangoFontDescription*)descr, NULL);
+}
+
+/* metrics */
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1font_1metrics_1get_1ascent
+  (JNIEnv *env, jclass that, jint metrics)
+{
+   return (jint)pango_font_metrics_get_ascent((PangoFontMetrics*)metrics);
+}
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1font_1metrics_1get_1descent
+  (JNIEnv *env, jclass that, jint metrics)
+{
+   return (jint)pango_font_metrics_get_descent((PangoFontMetrics*)metrics);
+}
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_pango_1font_1metrics_1get_1approximate_1char_1width
+  (JNIEnv *env, jclass that, jint metrics)
+{
+   return (jint)pango_font_metrics_get_approximate_char_width((PangoFontMetrics*)metrics);
+}
+