Bug 144765 Layout on Labels generates a size that cuts off characters

3 files changed, 30 insertions, 2 deletions

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 fb21bf8db8..06ad49ef78 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
@@ -8273,6 +8273,18 @@ fail:
 }
 #endif
 
+#ifndef NO__1gtk_1label_1get_1layout
+JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1layout)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1gtk_1label_1get_1layout_FUNC);
+	rc = (jint)gtk_label_get_layout((GtkLabel *)arg0);
+	OS_NATIVE_EXIT(env, that, _1gtk_1label_1get_1layout_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO__1gtk_1label_1get_1mnemonic_1keyval
 JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1label_1get_1mnemonic_1keyval)
 	(JNIEnv *env, jclass that, jint arg0)
@@ -15664,6 +15676,18 @@ JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1attributes)
 }
 #endif
 
+#ifndef NO__1pango_1layout_1get_1context
+JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1context)
+	(JNIEnv *env, jclass that, jint arg0)
+{
+	jint rc = 0;
+	OS_NATIVE_ENTER(env, that, _1pango_1layout_1get_1context_FUNC);
+	rc = (jint)pango_layout_get_context((PangoLayout *)arg0);
+	OS_NATIVE_EXIT(env, that, _1pango_1layout_1get_1context_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO__1pango_1layout_1get_1indent
 JNIEXPORT jint JNICALL OS_NATIVE(_1pango_1layout_1get_1indent)
 	(JNIEnv *env, jclass that, jint arg0)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
index bd7148d99a..e301dfee85 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c
@@ -18,8 +18,8 @@
 
 #ifdef NATIVE_STATS
 
-int OS_nativeFunctionCount = 1198;
-int OS_nativeFunctionCallCount[1198];
+int OS_nativeFunctionCount = 1200;
+int OS_nativeFunctionCallCount[1200];
 char * OS_nativeFunctionNames[] = {
 	"Call",
 	"GDK_1EVENT_1TYPE",
@@ -609,6 +609,7 @@ char * OS_nativeFunctionNames[] = {
 	"_1gtk_1image_1set_1from_1pixbuf",
 	"_1gtk_1image_1set_1from_1pixmap",
 	"_1gtk_1init_1check",
+	"_1gtk_1label_1get_1layout",
 	"_1gtk_1label_1get_1mnemonic_1keyval",
 	"_1gtk_1label_1new",
 	"_1gtk_1label_1new_1with_1mnemonic",
@@ -1111,6 +1112,7 @@ char * OS_nativeFunctionNames[] = {
 	"_1pango_1layout_1context_1changed",
 	"_1pango_1layout_1get_1alignment",
 	"_1pango_1layout_1get_1attributes",
+	"_1pango_1layout_1get_1context",
 	"_1pango_1layout_1get_1indent",
 	"_1pango_1layout_1get_1iter",
 	"_1pango_1layout_1get_1justify",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
index e528a1e69f..d59f45eeaa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h
@@ -613,6 +613,7 @@ typedef enum {
 	_1gtk_1image_1set_1from_1pixbuf_FUNC,
 	_1gtk_1image_1set_1from_1pixmap_FUNC,
 	_1gtk_1init_1check_FUNC,
+	_1gtk_1label_1get_1layout_FUNC,
 	_1gtk_1label_1get_1mnemonic_1keyval_FUNC,
 	_1gtk_1label_1new_FUNC,
 	_1gtk_1label_1new_1with_1mnemonic_FUNC,
@@ -1115,6 +1116,7 @@ typedef enum {
 	_1pango_1layout_1context_1changed_FUNC,
 	_1pango_1layout_1get_1alignment_FUNC,
 	_1pango_1layout_1get_1attributes_FUNC,
+	_1pango_1layout_1get_1context_FUNC,
 	_1pango_1layout_1get_1indent_FUNC,
 	_1pango_1layout_1get_1iter_FUNC,
 	_1pango_1layout_1get_1justify_FUNC,