summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Heidrich <fheidric>2005-03-28 20:49:12 +0000
committerFelipe Heidrich <fheidric>2005-03-28 20:49:12 +0000
commitc859fcaaf3f0f7dcca37adeead4a73517a83c5f4 (patch)
tree12017759e5c60f4bd6ba346ba1302b1e1a26a46a
parent3c35f69e3c0e5b7e1e15153ca6c21326e03ad81e (diff)
downloadeclipse.platform.swt-c859fcaaf3f0f7dcca37adeead4a73517a83c5f4.tar.gz
eclipse.platform.swt-c859fcaaf3f0f7dcca37adeead4a73517a83c5f4.tar.xz
eclipse.platform.swt-c859fcaaf3f0f7dcca37adeead4a73517a83c5f4.zip
86079
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c12
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h1
-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
6 files changed, 19 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 a29047b810..ada7ecaa80 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
@@ -11747,6 +11747,18 @@ fail:
}
#endif
+#ifndef NO_localeconv_1decimal_1point
+JNIEXPORT jint JNICALL OS_NATIVE(localeconv_1decimal_1point)
+ (JNIEnv *env, jclass that)
+{
+ jint rc = 0;
+ OS_NATIVE_ENTER(env, that, localeconv_1decimal_1point_FUNC);
+ rc = (jint)localeconv_decimal_point();
+ OS_NATIVE_EXIT(env, that, localeconv_1decimal_1point_FUNC);
+ return rc;
+}
+#endif
+
#ifndef NO_memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I
JNIEXPORT void JNICALL OS_NATIVE(memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I)
(JNIEnv *env, jclass that, jint arg0, jobject arg1, jint arg2)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
index 102de85605..12f869d9e1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h
@@ -30,6 +30,7 @@
#include <pango/pango-font.h>
#include <string.h>
#include <dlfcn.h>
+#include <locale.h>
#ifndef GDK_WINDOWING_X11
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 e47ac3df4f..f2c452e59e 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
@@ -84,4 +84,5 @@
#define gtk_style_get_text(arg0, arg1, arg2) *arg2 = (arg0)->text[arg1]
#define gtk_style_get_xthickness(arg0) (arg0)->xthickness
#define gtk_style_get_ythickness(arg0) (arg0)->ythickness
+#define localeconv_decimal_point() localeconv()->decimal_point
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 7bca84f624..f2ad661bc1 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 = 979;
-int OS_nativeFunctionCallCount[979];
+int OS_nativeFunctionCount = 980;
+int OS_nativeFunctionCallCount[980];
char * OS_nativeFunctionNames[] = {
"Call",
"GDK_1WINDOWING_1X11",
@@ -938,6 +938,7 @@ char * OS_nativeFunctionNames[] = {
"_1pango_1tab_1array_1set_1tab",
"g_1main_1context_1wakeup",
"getenv",
+ "localeconv_1decimal_1point",
"memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I",
"memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2",
"memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I",
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 b35bf15a51..e08484194a 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
@@ -942,6 +942,7 @@ typedef enum {
_1pango_1tab_1array_1set_1tab_FUNC,
g_1main_1context_1wakeup_FUNC,
getenv_FUNC,
+ localeconv_1decimal_1point_FUNC,
memmove__ILorg_eclipse_swt_internal_gtk_GInterfaceInfo_2I_FUNC,
memmove__ILorg_eclipse_swt_internal_gtk_GObjectClass_2_FUNC,
memmove__ILorg_eclipse_swt_internal_gtk_GTypeInfo_2I_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 26a6e03b56..fe82c85b52 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
@@ -477,6 +477,7 @@ public static final native int XFocusChangeEvent_sizeof();
public static final native int XVisibilityEvent_sizeof();
public static final native int XWindowChanges_sizeof();
public static final native int /*long*/ getenv(byte[] name);
+public static final native int /*long*/ localeconv_decimal_point();
public static final native int strlen(int /*long*/ str);
/** Object private fields accessors */