diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT WebKit')
22 files changed, 76 insertions, 96 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java index 3f61ab39e6..ea7ed4263b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebCookieManager.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebCookieManager extends IUnknown { @@ -24,7 +23,7 @@ public IWebCookieManager (long address) { } public int cookieStorage (long[] storage) { - return OS.VtblCall (3, getAddress (), storage); + return COM.VtblCall (3, getAddress (), storage); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java index 180bf8192e..2d54239fad 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDataSource.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebDataSource extends IUnknown { @@ -24,19 +23,19 @@ public IWebDataSource (long address) { } public int representation (long[] rep) { - return OS.VtblCall (5, getAddress (), rep); + return COM.VtblCall (5, getAddress (), rep); } public int webFrame (long[] frame) { - return OS.VtblCall (6, getAddress (), frame); + return COM.VtblCall (6, getAddress (), frame); } public int request (long[] request) { - return OS.VtblCall (8, getAddress (), request); + return COM.VtblCall (8, getAddress (), request); } public int pageTitle (long[] title) { - return OS.VtblCall (12, getAddress (), title); + return COM.VtblCall (12, getAddress (), title); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java index da31f88e59..e18eda855d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDocumentRepresentation.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebDocumentRepresentation extends IUnknown { @@ -24,7 +23,7 @@ public IWebDocumentRepresentation (long address) { } public int documentSource (long[] source) { - return OS.VtblCall (8, getAddress (), source); + return COM.VtblCall (8, getAddress (), source); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java index 832a74088f..610252bb9d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebDownload.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebDownload extends IUnknown { @@ -24,15 +23,15 @@ public IWebDownload (long address) { } public int cancel () { - return OS.VtblCall (4, getAddress ()); + return COM.VtblCall (4, getAddress ()); } public int setDeletesFileUponFailure (int deletesFileUponFailure) { - return OS.VtblCall (12, getAddress (), deletesFileUponFailure); + return COM.VtblCall (12, getAddress (), deletesFileUponFailure); } public int setDestination (long path, int allowOverwrite) { - return OS.VtblCall (13, getAddress(), path, allowOverwrite); + return COM.VtblCall (13, getAddress(), path, allowOverwrite); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java index 1917d78f03..c8ac6b99c4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebError.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebError extends IUnknown { @@ -24,7 +23,7 @@ public IWebError (long address) { } public int code (int[] result) { - return OS.VtblCall (4, getAddress (), result); + return COM.VtblCall (4, getAddress (), result); } //public int domain (long[] result) { @@ -32,7 +31,7 @@ public int code (int[] result) { //} public int localizedDescription (long[] result) { - return OS.VtblCall (6, getAddress (), result); + return COM.VtblCall (6, getAddress (), result); } //public int localizedFailureReason (long[] result) { @@ -44,7 +43,7 @@ public int localizedDescription (long[] result) { //} public int failingURL (long[] result) { - return OS.VtblCall (12, getAddress (), result); + return COM.VtblCall (12, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java index 0666b4bbdd..deec3f5502 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebErrorPrivate.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebErrorPrivate extends IUnknown { @@ -24,7 +23,7 @@ public IWebErrorPrivate (long address) { } public int sslPeerCertificate (long[] result) { - return OS.VtblCall (3, getAddress (), result); + return COM.VtblCall (3, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java index 750b457ed3..5ca43a6e60 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFrame.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebFrame extends IUnknown { @@ -24,19 +23,19 @@ public IWebFrame (long address) { } public int loadRequest (long request) { - return OS.VtblCall (8, getAddress (), request); + return COM.VtblCall (8, getAddress (), request); } public int loadHTMLString (long string, long baseURL) { - return OS.VtblCall (10, getAddress (), string, baseURL); + return COM.VtblCall (10, getAddress (), string, baseURL); } public int dataSource (long[] source) { - return OS.VtblCall (13, getAddress (), source); + return COM.VtblCall (13, getAddress (), source); } public long globalContext () { - return OS.VtblCall (23, getAddress ()); + return COM.VtblCall (23, getAddress ()); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java index 4e60f157fb..9873a903c1 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebFramePrivate.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebFramePrivate extends IUnknown { @@ -24,15 +23,15 @@ public IWebFramePrivate (long address) { } public int setInPrintingMode (int value, long printDC) { - return OS.VtblCall (8, getAddress (), value, printDC); + return COM.VtblCall (8, getAddress (), value, printDC); } public int getPrintedPageCount (long printDC, int[] pageCount) { - return OS.VtblCall (9, getAddress (), printDC, pageCount); + return COM.VtblCall (9, getAddress (), printDC, pageCount); } public int spoolPages (long printDC, int startPage, int endPage, long[] ctx) { - return OS.VtblCall (10, getAddress (), printDC, startPage, endPage, ctx); + return COM.VtblCall (10, getAddress (), printDC, startPage, endPage, ctx); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java index 0117c86c61..dd5e1eafe7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebIBActions.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebIBActions extends IUnknown { @@ -24,19 +23,19 @@ public IWebIBActions (long address) { } public int stopLoading (long sender) { - return OS.VtblCall (4, getAddress (), sender); + return COM.VtblCall (4, getAddress (), sender); } public int reload (long sender) { - return OS.VtblCall (5, getAddress (), sender); + return COM.VtblCall (5, getAddress (), sender); } public int canGoBack (long sender, int[] result) { - return OS.VtblCall (6, getAddress (), sender, result); + return COM.VtblCall (6, getAddress (), sender, result); } public int canGoForward (long sender, int[] result) { - return OS.VtblCall (8, getAddress (), sender, result); + return COM.VtblCall (8, getAddress (), sender, result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java index 0d83f033be..a0729172d0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequest.java @@ -14,7 +14,7 @@ package org.eclipse.swt.internal.webkit; -import org.eclipse.swt.internal.win32.*; +import org.eclipse.swt.internal.ole.win32.*; public class IWebMutableURLRequest extends IWebURLRequest { @@ -31,19 +31,19 @@ public IWebMutableURLRequest (long address) { //} public int setHTTPMethod (int post) { - return OS.VtblCall (23, getAddress (), post); + return COM.VtblCall (23, getAddress (), post); } public int setURL (long theUrl) { - return OS.VtblCall (27, getAddress (), theUrl); + return COM.VtblCall (27, getAddress (), theUrl); } public int setValue (long value, long field) { - return OS.VtblCall (28, getAddress (), value, field); + return COM.VtblCall (28, getAddress (), value, field); } public int setAllowsAnyHTTPSCertificate () { - return OS.VtblCall (29, getAddress ()); + return COM.VtblCall (29, getAddress ()); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java index ef531a2c57..fb8046ab15 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebMutableURLRequestPrivate.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebMutableURLRequestPrivate extends IUnknown { @@ -28,7 +27,7 @@ public IWebMutableURLRequestPrivate (long address) { //} public int cfRequest () { - return OS.VtblCall (4, getAddress ()); + return COM.VtblCall (4, getAddress ()); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java index 5f3aef2a10..0e2ae45513 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebOpenPanelResultListener.java @@ -14,7 +14,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebOpenPanelResultListener extends IUnknown { @@ -23,11 +22,11 @@ public IWebOpenPanelResultListener (long address) { } public int chooseFilename (long fileName) { - return OS.VtblCall (3, getAddress (), fileName); + return COM.VtblCall (3, getAddress (), fileName); } public int cancel () { - return OS.VtblCall (4, getAddress ()); + return COM.VtblCall (4, getAddress ()); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java index 74520ba60a..97b505e074 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPolicyDecisionListener.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebPolicyDecisionListener extends IUnknown{ @@ -24,15 +23,15 @@ public IWebPolicyDecisionListener (long address) { } public int use () { - return OS.VtblCall (3, getAddress ()); + return COM.VtblCall (3, getAddress ()); } public int download () { - return OS.VtblCall (4, getAddress ()); + return COM.VtblCall (4, getAddress ()); } public int ignore () { - return OS.VtblCall (5, getAddress ()); + return COM.VtblCall (5, getAddress ()); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java index fdf79a49d4..36c9b0d328 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebPreferences.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebPreferences extends IUnknown { @@ -28,23 +27,23 @@ public int initWithIdentifier (long identifier, long[] preferences) { } public int setJavaEnabled (int enabled) { - return OS.VtblCall (33, getAddress (), enabled); + return COM.VtblCall (33, getAddress (), enabled); } public int setJavaScriptEnabled (int enabled) { - return OS.VtblCall (35, getAddress (), enabled); + return COM.VtblCall (35, getAddress (), enabled); } public int setJavaScriptCanOpenWindowsAutomatically (int enabled) { - return OS.VtblCall (37, getAddress (), enabled); + return COM.VtblCall (37, getAddress (), enabled); } public int setTabsToLinks (int enabled) { - return OS.VtblCall (52, getAddress (), enabled); + return COM.VtblCall (52, getAddress (), enabled); } public int setFontSmoothing (int smoothingType) { - return OS.VtblCall (63, getAddress (), smoothingType); + return COM.VtblCall (63, getAddress (), smoothingType); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java index 17b3b9b07d..886c372329 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallenge.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLAuthenticationChallenge extends IUnknown { @@ -24,19 +23,19 @@ public IWebURLAuthenticationChallenge (long address) { } public int previousFailureCount (int[] result) { - return OS.VtblCall (7, getAddress (), result); + return COM.VtblCall (7, getAddress (), result); } public int proposedCredential (long[] result) { - return OS.VtblCall (8, getAddress (), result); + return COM.VtblCall (8, getAddress (), result); } public int protectionSpace (long[] result) { - return OS.VtblCall (9, getAddress (), result); + return COM.VtblCall (9, getAddress (), result); } public int sender (long[] sender) { - return OS.VtblCall (10, getAddress (), sender); + return COM.VtblCall (10, getAddress (), sender); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java index 7bbac4d91a..bd4b66bb1b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLAuthenticationChallengeSender.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLAuthenticationChallengeSender extends IUnknown { @@ -24,11 +23,11 @@ public IWebURLAuthenticationChallengeSender (long address) { } public int cancelAuthenticationChallenge (long challenge) { - return OS.VtblCall (3, getAddress (), challenge); + return COM.VtblCall (3, getAddress (), challenge); } public int useCredential (long credential, long challenge) { - return OS.VtblCall (5, getAddress (), credential, challenge); + return COM.VtblCall (5, getAddress (), credential, challenge); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java index 7f50e2187c..0fe000b9c8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLCredential.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLCredential extends IUnknown { @@ -24,19 +23,19 @@ public IWebURLCredential (long address) { } public int hasPassword (int[] result) { - return OS.VtblCall (3, getAddress (), result); + return COM.VtblCall (3, getAddress (), result); } public int initWithUser (long user, long password, long persistence) { - return OS.VtblCall (4, getAddress (), user, password, persistence); + return COM.VtblCall (4, getAddress (), user, password, persistence); } public int password (long[] password) { - return OS.VtblCall (5, getAddress (), password); + return COM.VtblCall (5, getAddress (), password); } public int user (long[] result) { - return OS.VtblCall (7, getAddress (), result); + return COM.VtblCall (7, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java index 93c4b36ab5..4766a2748e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLProtectionSpace.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLProtectionSpace extends IUnknown { @@ -24,15 +23,15 @@ public IWebURLProtectionSpace(long address) { } public int host (long[] result) { - return OS.VtblCall (4, getAddress (), result); + return COM.VtblCall (4, getAddress (), result); } public int port (int[] result) { - return OS.VtblCall (8, getAddress (), result); + return COM.VtblCall (8, getAddress (), result); } public int realm (long[] result) { - return OS.VtblCall (11, getAddress (), result); + return COM.VtblCall (11, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java index a0b5b538ba..b426d905d7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLRequest.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLRequest extends IUnknown { @@ -28,15 +27,15 @@ public IWebURLRequest (long address) { //} public int HTTPMethod (long[] result) { - return OS.VtblCall (8, getAddress (), result); + return COM.VtblCall (8, getAddress (), result); } public int URL (long[] result) { - return OS.VtblCall (13, getAddress (), result); + return COM.VtblCall (13, getAddress (), result); } public int mutableCopy (long[] result) { - return OS.VtblCall (16, getAddress (), result); + return COM.VtblCall (16, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java index 8a87223998..a157911320 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebURLResponse.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebURLResponse extends IUnknown { @@ -24,11 +23,11 @@ public IWebURLResponse (long address) { } public int expectedContentLength (long[] result) { - return OS.VtblCall (3, getAddress (), result); + return COM.VtblCall (3, getAddress (), result); } public int URL (long[] result) { - return OS.VtblCall (8, getAddress (), result); + return COM.VtblCall (8, getAddress (), result); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java index 99b8735956..f5f89048ec 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebView.java @@ -24,7 +24,7 @@ public IWebView (long address) { } public int canShowMIMEType (long mimeType, int[] canShow) { - return OS.VtblCall (3, getAddress (), mimeType, canShow); + return COM.VtblCall (3, getAddress (), mimeType, canShow); } public int initWithFrame (RECT frame, long frameName, long groupName) { @@ -32,59 +32,59 @@ public int initWithFrame (RECT frame, long frameName, long groupName) { } public int setUIDelegate (long delegate) { - return OS.VtblCall (10, getAddress (), delegate); + return COM.VtblCall (10, getAddress (), delegate); } public int setResourceLoadDelegate (long delegate) { - return OS.VtblCall (12, getAddress (), delegate); + return COM.VtblCall (12, getAddress (), delegate); } public int setDownloadDelegate (long delegate) { - return OS.VtblCall (14, getAddress (), delegate); + return COM.VtblCall (14, getAddress (), delegate); } public int setFrameLoadDelegate (long delegate) { - return OS.VtblCall (16, getAddress (), delegate); + return COM.VtblCall (16, getAddress (), delegate); } public int setPolicyDelegate (long delegate) { - return OS.VtblCall (18, getAddress (), delegate); + return COM.VtblCall (18, getAddress (), delegate); } public int mainFrame (long[] frame) { - return OS.VtblCall (20, getAddress (), frame); + return COM.VtblCall (20, getAddress (), frame); } public int goBack (int[] succeeded) { - return OS.VtblCall (24, getAddress(), succeeded); + return COM.VtblCall (24, getAddress(), succeeded); } public int goForward (int[] succeeded) { - return OS.VtblCall (25, getAddress(), succeeded); + return COM.VtblCall (25, getAddress(), succeeded); } public int setCustomUserAgent (long valueString) { - return OS.VtblCall (31, getAddress (), valueString); + return COM.VtblCall (31, getAddress (), valueString); } public int setPreferences (long prefs) { - return OS.VtblCall (41, getAddress (), prefs); + return COM.VtblCall (41, getAddress (), prefs); } public int preferences (long[] prefs) { - return OS.VtblCall (42, getAddress (), prefs); + return COM.VtblCall (42, getAddress (), prefs); } public int setHostWindow (long window) { - return OS.VtblCall (45, getAddress (), window); + return COM.VtblCall (45, getAddress (), window); } public int hostWindow (long[] window) { - return OS.VtblCall (46, getAddress (), window); + return COM.VtblCall (46, getAddress (), window); } public int estimatedProgress (long estimatedProgress) { - return OS.VtblCall (51, getAddress (), estimatedProgress); + return COM.VtblCall (51, getAddress (), estimatedProgress); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java index a620bd5e2b..e067052242 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/internal/webkit/IWebViewPrivate.java @@ -15,7 +15,6 @@ package org.eclipse.swt.internal.webkit; import org.eclipse.swt.internal.ole.win32.*; -import org.eclipse.swt.internal.win32.*; public class IWebViewPrivate extends IUnknown { @@ -24,15 +23,15 @@ public IWebViewPrivate (long address) { } public int viewWindow (long[] window) { - return OS.VtblCall (5, getAddress (), window); + return COM.VtblCall (5, getAddress (), window); } public int setInitialFocus (int forwardEnabled) { - return OS.VtblCall (28, getAddress (), forwardEnabled); + return COM.VtblCall (28, getAddress (), forwardEnabled); } public int shouldClose (int[] result) { - return OS.VtblCall (33, getAddress (), result); + return COM.VtblCall (33, getAddress (), result); } } |