diff options
5 files changed, 76 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties index 1b9a7531b5..7c47c95158 100644 --- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties +++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties @@ -38,9 +38,18 @@ OS_ApplicationCommands_Redo=accessor=ApplicationCommands::Redo,flags=const gcobj OS_ApplicationCommands_Undo=accessor=ApplicationCommands::Undo,flags=const gcobject +OS_Application_Current=accessor=Application::Current,flags=const gcobject + OS_Application_Dispatcher=flags=gcobject getter OS_Application_Dispatcher_0=cast=Application ^,flags=gcobject +OS_Application_1Resources__I=flags=gcobject getter +OS_Application_1Resources__I_0=cast=Application^,flags=gcobject + +OS_Application_1Resources__II=flags=setter +OS_Application_1Resources__II_0=cast=Application^,flags=gcobject +OS_Application_1Resources__II_1=cast=ResourceDictionary^,flags=gcobject + OS_Application_Run=flags=cpp OS_Application_Run_0=cast=Application^,flags=gcobject @@ -906,6 +915,9 @@ OS_FileInfo_Name_0=cast=(System::IO::FileInfo^),flags=gcobject OS_File_Exists=accessor=System::IO::File::Exists OS_File_Exists_0=cast=String^,flags=gcobject +OS_File_ReadAllText=accessor=System::IO::File::ReadAllText,flags=gcobject +OS_File_ReadAllText_0=cast=String^,flags=gcobject + OS_FocusManager_GetFocusScope=accessor=FocusManager::GetFocusScope,flags=gcobject OS_FocusManager_GetFocusScope_0=cast=(DependencyObject^),flags=gcobject diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp index 11834849cd..be3976d10a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp @@ -91,6 +91,19 @@ JNIEXPORT jint JNICALL OS_NATIVE(ApplicationCommands_1Undo) } #endif +#ifndef NO_Application_1Current +extern "C" JNIEXPORT jint JNICALL OS_NATIVE(Application_1Current)(JNIEnv *env, jclass that); +JNIEXPORT jint JNICALL OS_NATIVE(Application_1Current) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, Application_1Current_FUNC); + rc = (jint)TO_HANDLE(Application::Current); + OS_NATIVE_EXIT(env, that, Application_1Current_FUNC); + return rc; +} +#endif + #ifndef NO_Application_1Dispatcher extern "C" JNIEXPORT jint JNICALL OS_NATIVE(Application_1Dispatcher)(JNIEnv *env, jclass that, jint arg0); JNIEXPORT jint JNICALL OS_NATIVE(Application_1Dispatcher) @@ -104,6 +117,30 @@ JNIEXPORT jint JNICALL OS_NATIVE(Application_1Dispatcher) } #endif +#ifndef NO_Application_1Resources__I +extern "C" JNIEXPORT jint JNICALL OS_NATIVE(Application_1Resources__I)(JNIEnv *env, jclass that, jint arg0); +JNIEXPORT jint JNICALL OS_NATIVE(Application_1Resources__I) + (JNIEnv *env, jclass that, jint arg0) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, Application_1Resources__I_FUNC); + rc = (jint)TO_HANDLE(((Application^)TO_OBJECT(arg0))->Resources); + OS_NATIVE_EXIT(env, that, Application_1Resources__I_FUNC); + return rc; +} +#endif + +#ifndef NO_Application_1Resources__II +extern "C" JNIEXPORT void JNICALL OS_NATIVE(Application_1Resources__II)(JNIEnv *env, jclass that, jint arg0, jint arg1); +JNIEXPORT void JNICALL OS_NATIVE(Application_1Resources__II) + (JNIEnv *env, jclass that, jint arg0, jint arg1) +{ + OS_NATIVE_ENTER(env, that, Application_1Resources__II_FUNC); + ((Application^)TO_OBJECT(arg0))->Resources = ((ResourceDictionary^)TO_OBJECT(arg1)); + OS_NATIVE_EXIT(env, that, Application_1Resources__II_FUNC); +} +#endif + #ifndef NO_Application_1Run extern "C" JNIEXPORT void JNICALL OS_NATIVE(Application_1Run)(JNIEnv *env, jclass that, jint arg0); JNIEXPORT void JNICALL OS_NATIVE(Application_1Run) @@ -3328,6 +3365,19 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(File_1Exists) } #endif +#ifndef NO_File_1ReadAllText +extern "C" JNIEXPORT jint JNICALL OS_NATIVE(File_1ReadAllText)(JNIEnv *env, jclass that, jint arg0); +JNIEXPORT jint JNICALL OS_NATIVE(File_1ReadAllText) + (JNIEnv *env, jclass that, jint arg0) +{ + jint rc = 0; + OS_NATIVE_ENTER(env, that, File_1ReadAllText_FUNC); + rc = (jint)TO_HANDLE(System::IO::File::ReadAllText((String^)TO_OBJECT(arg0))); + OS_NATIVE_EXIT(env, that, File_1ReadAllText_FUNC); + return rc; +} +#endif + #ifndef NO_FocusManager_1GetFocusScope extern "C" JNIEXPORT jint JNICALL OS_NATIVE(FocusManager_1GetFocusScope)(JNIEnv *env, jclass that, jint arg0); JNIEXPORT jint JNICALL OS_NATIVE(FocusManager_1GetFocusScope) diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp index 1cbca8de20..5c67b4f414 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp @@ -14,8 +14,8 @@ #ifdef NATIVE_STATS -int OS_nativeFunctionCount = 1255; -int OS_nativeFunctionCallCount[1255]; +int OS_nativeFunctionCount = 1259; +int OS_nativeFunctionCallCount[1259]; char * OS_nativeFunctionNames[] = { "AccessText_1AccessKey", "AccessText_1Text", @@ -23,7 +23,10 @@ char * OS_nativeFunctionNames[] = { "ApplicationCommands_1Paste", "ApplicationCommands_1Redo", "ApplicationCommands_1Undo", + "Application_1Current", "Application_1Dispatcher", + "Application_1Resources__I", + "Application_1Resources__II", "Application_1Run", "Application_1Shutdown", "Application_1ShutdownMode", @@ -284,6 +287,7 @@ char * OS_nativeFunctionNames[] = { "FileInfo_1DirectoryName", "FileInfo_1Name", "File_1Exists", + "File_1ReadAllText", "FocusManager_1GetFocusScope", "FocusManager_1GetFocusedElement", "FolderBrowserDialog_1Description", diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h index 1e2e3d2fb6..99bc1a7eec 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h @@ -31,7 +31,10 @@ typedef enum { ApplicationCommands_1Paste_FUNC, ApplicationCommands_1Redo_FUNC, ApplicationCommands_1Undo_FUNC, + Application_1Current_FUNC, Application_1Dispatcher_FUNC, + Application_1Resources__I_FUNC, + Application_1Resources__II_FUNC, Application_1Run_FUNC, Application_1Shutdown_FUNC, Application_1ShutdownMode_FUNC, @@ -292,6 +295,7 @@ typedef enum { FileInfo_1DirectoryName_FUNC, FileInfo_1Name_FUNC, File_1Exists_FUNC, + File_1ReadAllText_FUNC, FocusManager_1GetFocusScope_FUNC, FocusManager_1GetFocusedElement_FUNC, FolderBrowserDialog_1Description_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java index 32af35bd18..75ee96ad4a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java @@ -445,7 +445,10 @@ public static final native int ApplicationCommands_Cut(); public static final native int ApplicationCommands_Paste(); public static final native int ApplicationCommands_Redo(); public static final native int ApplicationCommands_Undo(); +public static final native int Application_Current(); public static final native int Application_Dispatcher(int sender); +public static final native int Application_Resources(int sender); +public static final native void Application_Resources(int sender, int value); public static final native void Application_Run(int sender); public static final native void Application_Shutdown(int sender); public static final native void Application_ShutdownMode(int sender, int value); @@ -697,6 +700,7 @@ public static final native void FileDialog_Title(int sender, int value); public static final native int FileInfo_DirectoryName(int sender); public static final native int FileInfo_Name(int sender); public static final native boolean File_Exists(int sender); +public static final native int File_ReadAllText(int sender); public static final native int FocusManager_GetFocusScope(int element); public static final native int FocusManager_GetFocusedElement(int element); public static final native void FolderBrowserDialog_Description(int sender, int value); |