Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 9290e78

Browse files
livecodeianlivecodeian
committed
[[ BrowserWidget ]] Fix signature of MCBrowserGoToURL function
[[ BrowserWidget ]] Use MCBrowserWidgetGoToURL in setUrl handler
1 parent 4d1f91f commit 9290e78

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

‎engine/src/browser.lcb‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ public type MCBrowserValueType is CInt
5252
public type MCBrowserRequestType is CInt
5353
public type MCBrowserRequestState is CInt
5454

55+
public type MCBrowserString is NativeCString
56+
5557
--
5658

5759
public foreign handler MCBrowserLibraryInitialize() returns CBool binds to "<builtin>"
@@ -71,13 +73,13 @@ public foreign handler MCBrowserGetNativeLayer(in pBrowser as MCBrowserRef) retu
7173
public foreign handler MCBrowserGetBoolProperty(in pBrowser as MCBrowserRef, in pProperty as MCBrowserProperty, out rValue as CBool) returns CBool binds to "<builtin>"
7274
public foreign handler MCBrowserSetBoolProperty(in pBrowser as MCBrowserRef, in pProperty as MCBrowserProperty, in pValue as CBool) returns CBool binds to "<builtin>"
7375

74-
public foreign handler MCBrowserGetStringProperty(in pBrowser as MCBrowserRef, in pProperty as MCBrowserProperty, out rValue as NativeCString) returns CBool binds to "<builtin>"
75-
public foreign handler MCBrowserSetStringProperty(in pBrowser as MCBrowserRef, in pProperty as MCBrowserProperty, in pValue as NativeCString) returns CBool binds to "<builtin>"
76+
public foreign handler MCBrowserGetStringProperty(in pBrowser as MCBrowserRef, in pProperty as MCBrowserProperty, out rValue as MCBrowserString) returns CBool binds to "<builtin>"
77+
public foreign handler MCBrowserSetStringProperty(in pBrowser as MCBrowserRef, in pProperty as MCBrowserProperty, in pValue as MCBrowserString) returns CBool binds to "<builtin>"
7678

7779
public foreign handler MCBrowserGoBack(in pBrowser as MCBrowserRef) returns CBool binds to "<builtin>"
7880
public foreign handler MCBrowserGoForward(in pBrowser as MCBrowserRef) returns CBool binds to "<builtin>"
79-
public foreign handler MCBrowserGoToURL(in pBrowser as MCBrowserRef) returns CBool binds to "<builtin>"
80-
public foreign handler MCBrowserEvaluateJavaScript(in pBrowser as MCBrowserRef, in pScript as NativeCString, out rResult as NativeCString) returns CBool binds to "<builtin>"
81+
public foreign handler MCBrowserGoToURL(in pBrowser as MCBrowserRef, in pURL as MCBrowserString) returns CBool binds to "<builtin>"
82+
public foreign handler MCBrowserEvaluateJavaScript(in pBrowser as MCBrowserRef, in pScript as MCBrowserString, out rResult as MCBrowserString) returns CBool binds to "<builtin>"
8183

8284
----------
8385

‎extensions/widgets/browser/browser.lcb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ end handler
231231

232232
public handler setUrl(in pUrl as String)
233233
put "url" into mContentSource
234-
setProperty("url", pUrl)
234+
MCBrowserGoToURL(mBrowser, pUrl)
235235
end handler
236236

237237
--

‎libbrowser/include/libbrowser.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ MC_DLLEXPORT bool MCBrowserSetStringProperty(MCBrowserRef p_browser, MCBrowserPr
202202

203203
MC_DLLEXPORT bool MCBrowserGoBack(MCBrowserRef p_browser);
204204
MC_DLLEXPORT bool MCBrowserGoForward(MCBrowserRef p_browser);
205-
MC_DLLEXPORT bool MCBrowserGoToURL(MCBrowserRef p_browser);
205+
MC_DLLEXPORT bool MCBrowserGoToURL(MCBrowserRef p_browser, const char *p_url);
206206
MC_DLLEXPORT bool MCBrowserEvaluateJavaScript(MCBrowserRef p_browser, const char *p_script, char *&r_result);
207207

208208
enum MCBrowserRequestType

0 commit comments

Comments
 (0)