summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Heidrich <fheidric>2005-05-09 20:17:50 +0000
committerFelipe Heidrich <fheidric>2005-05-09 20:17:50 +0000
commite85528c6b29503dc35d536640be9f81c29fde4e9 (patch)
tree48e626659d198f30ddc1b19ced31fe377cb5aa08
parent4ef1b9d6c5f4d25d090a902c26c25b831f99e2d9 (diff)
downloadeclipse.platform.swt-e85528c6b29503dc35d536640be9f81c29fde4e9.tar.gz
eclipse.platform.swt-e85528c6b29503dc35d536640be9f81c29fde4e9.tar.xz
eclipse.platform.swt-e85528c6b29503dc35d536640be9f81c29fde4e9.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c10
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java1
5 files changed, 3 insertions, 15 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 66164e6b55..ea4698c93b 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
@@ -11616,16 +11616,6 @@ JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1attributes)
}
#endif
-#ifndef NO__1pango_1layout_1set_1auto_1dir
-JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1auto_1dir)
- (JNIEnv *env, jclass that, jint arg0, jboolean arg1)
-{
- OS_NATIVE_ENTER(env, that, _1pango_1layout_1set_1auto_1dir_FUNC);
- pango_layout_set_auto_dir(arg0, arg1);
- OS_NATIVE_EXIT(env, that, _1pango_1layout_1set_1auto_1dir_FUNC);
-}
-#endif
-
#ifndef NO__1pango_1layout_1set_1font_1description
JNIEXPORT void JNICALL OS_NATIVE(_1pango_1layout_1set_1font_1description)
(JNIEnv *env, jclass that, jint arg0, jint arg1)
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 70864a6438..c0678d532c 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 = 987;
-int OS_nativeFunctionCallCount[987];
+int OS_nativeFunctionCount = 986;
+int OS_nativeFunctionCallCount[986];
char * OS_nativeFunctionNames[] = {
"Call",
"GDK_1WINDOWING_1X11",
@@ -928,7 +928,6 @@ char * OS_nativeFunctionNames[] = {
"_1pango_1layout_1new",
"_1pango_1layout_1set_1alignment",
"_1pango_1layout_1set_1attributes",
- "_1pango_1layout_1set_1auto_1dir",
"_1pango_1layout_1set_1font_1description",
"_1pango_1layout_1set_1single_1paragraph_1mode",
"_1pango_1layout_1set_1spacing",
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 7010dd2a2a..946147be27 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
@@ -932,7 +932,6 @@ typedef enum {
_1pango_1layout_1new_FUNC,
_1pango_1layout_1set_1alignment_FUNC,
_1pango_1layout_1set_1attributes_FUNC,
- _1pango_1layout_1set_1auto_1dir_FUNC,
_1pango_1layout_1set_1font_1description_FUNC,
_1pango_1layout_1set_1single_1paragraph_1mode_FUNC,
_1pango_1layout_1set_1spacing_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 3830da0264..3f1a0daf72 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
@@ -505,6 +505,7 @@ public static final int Above = 0;
public static final int Below = 1;
public static final int ButtonRelease = 5;
public static final int ClientMessage = 33;
+public static final int CurrentTime = 0;
public static final int CWSibling = 0x20;
public static final int CWStackMode = 0x40;
public static final int EnterNotify = 7;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
index 385199a1b2..ecd5cfd8d2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/TextLayout.java
@@ -70,7 +70,6 @@ public TextLayout (Device device) {
layout = OS.pango_layout_new(context);
if (layout == 0) SWT.error(SWT.ERROR_NO_HANDLES);
OS.pango_context_set_language(context, OS.gtk_get_default_language());
- OS.pango_layout_set_auto_dir(layout, false);
OS.pango_context_set_base_dir(context, OS.PANGO_DIRECTION_LTR);
OS.gdk_pango_context_set_colormap(context, OS.gdk_colormap_get_system());
OS.pango_layout_set_wrap(layout, OS.PANGO_WRAP_WORD_CHAR);