summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Heidrich <fheidric>2007-03-14 20:06:24 +0000
committerFelipe Heidrich <fheidric>2007-03-14 20:06:24 +0000
commit063b74352e22e9e02c20953e2009de687202b5c2 (patch)
treea9c3faddfb759ab0e38fd1e5c2ed1a10de5c80b0
parent128587bab25f9b64aa2f993b2b9fe79613598cc8 (diff)
downloadeclipse.platform.swt-063b74352e22e9e02c20953e2009de687202b5c2.tar.gz
eclipse.platform.swt-063b74352e22e9e02c20953e2009de687202b5c2.tar.xz
eclipse.platform.swt-063b74352e22e9e02c20953e2009de687202b5c2.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/org.eclipse.swt.internal.wpf.OS.properties6
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/wpf/org/eclipse/swt/browser/IE.java4
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os.cpp11
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.cpp5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/wpf/library/os_stats.h1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/wpf/org/eclipse/swt/internal/wpf/OS.java2
6 files changed, 24 insertions, 5 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 ae0e1c2692..072b521898 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
@@ -982,7 +982,11 @@ OS_Frame_GoForward_0=cast=(Frame^),flags=gcobject
OS_Frame_Navigate=flags=cpp
OS_Frame_Navigate_0=cast=(Frame^),flags=gcobject
-OS_Frame_Navigate_1=
+OS_Frame_Navigate_1=cast=(Uri^),flags=gcobject
+
+OS_Frame_NavigationUIVisibility=flags=setter
+OS_Frame_NavigationUIVisibility_0=cast=Frame^,flags=gcobject
+OS_Frame_NavigationUIVisibility_1=cast=(System::Windows::Navigation::NavigationUIVisibility)
OS_Frame_Refresh=flags=cpp
OS_Frame_Refresh_0=cast=(Frame^),flags=gcobject
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/wpf/org/eclipse/swt/browser/IE.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/wpf/org/eclipse/swt/browser/IE.java
index eae1acbaf2..5406e51541 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/wpf/org/eclipse/swt/browser/IE.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/wpf/org/eclipse/swt/browser/IE.java
@@ -31,6 +31,7 @@ class IE extends WebBrowser {
public void create(Composite parent, int style) {
frame = OS.gcnew_Frame();
if (frame == 0) SWT.error(SWT.ERROR_NO_HANDLES);
+ OS.Frame_NavigationUIVisibility(frame, OS.NavigationUIVisibility_Hidden);
int parentHandle = browser.handle;
int children = OS.Panel_Children(parentHandle);
OS.UIElementCollection_Insert(children, 0, frame);
@@ -138,7 +139,7 @@ public void refresh() {
}
public boolean setText(String html) {
- return false;
+ return true;
// /*
// * If the html field is non-null then the about:blank page is already being
// * loaded, so no Stop or Navigate is required. Just set the html that is to
@@ -197,6 +198,7 @@ public boolean setText(String html) {
}
public boolean setUrl(String url) {
+ if (url.indexOf(':') == -1) url = "http://" + url;
int length = url.length ();
char [] buffer = new char [length + 1];
url.getChars (0, length, buffer, 0);
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 d3404bc4d7..79aec5cdf4 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
@@ -3658,6 +3658,17 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(Frame_1Navigate)
}
#endif
+#ifndef NO_Frame_1NavigationUIVisibility
+extern "C" JNIEXPORT void JNICALL OS_NATIVE(Frame_1NavigationUIVisibility)(JNIEnv *env, jclass that, jint arg0, jint arg1);
+JNIEXPORT void JNICALL OS_NATIVE(Frame_1NavigationUIVisibility)
+ (JNIEnv *env, jclass that, jint arg0, jint arg1)
+{
+ OS_NATIVE_ENTER(env, that, Frame_1NavigationUIVisibility_FUNC);
+ ((Frame^)TO_OBJECT(arg0))->NavigationUIVisibility = ((System::Windows::Navigation::NavigationUIVisibility)arg1);
+ OS_NATIVE_EXIT(env, that, Frame_1NavigationUIVisibility_FUNC);
+}
+#endif
+
#ifndef NO_Frame_1Refresh
extern "C" JNIEXPORT void JNICALL OS_NATIVE(Frame_1Refresh)(JNIEnv *env, jclass that, jint arg0);
JNIEXPORT void JNICALL OS_NATIVE(Frame_1Refresh)
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 fcc9ca6ff8..a377cc2857 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 = 1180;
-int OS_nativeFunctionCallCount[1180];
+int OS_nativeFunctionCount = 1181;
+int OS_nativeFunctionCallCount[1181];
char * OS_nativeFunctionNames[] = {
"AccessText_1AccessKey",
"AccessText_1Text",
@@ -310,6 +310,7 @@ char * OS_nativeFunctionNames[] = {
"Frame_1GoBack",
"Frame_1GoForward",
"Frame_1Navigate",
+ "Frame_1NavigationUIVisibility",
"Frame_1Refresh",
"Frame_1Source__I",
"Frame_1Source__II",
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 dd27555b96..a0f7b8a0f6 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
@@ -318,6 +318,7 @@ typedef enum {
Frame_1GoBack_FUNC,
Frame_1GoForward_FUNC,
Frame_1Navigate_FUNC,
+ Frame_1NavigationUIVisibility_FUNC,
Frame_1Refresh_FUNC,
Frame_1Source__I_FUNC,
Frame_1Source__II_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 7ee3bd8a80..f2649cb089 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
@@ -712,7 +712,7 @@ public static final native int Frame_CurrentSource(int sender);
public static final native int Frame_Source(int sender);
public static final native void Frame_Source(int sender, int uri);
public static final native boolean Frame_Navigate(int sender, int uri);
-public static final native void Frame_NavigationUIVisibily(int sender, int visiblity);
+public static final native void Frame_NavigationUIVisibility(int sender, int visiblity);
public static final native void Frame_GoBack(int sender);
public static final native void Frame_GoForward(int sender);
public static final native void Frame_Refresh(int sender);