Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxWebView compilation in STL build with wxGTK.

Browse Source 
Convert wxString to GTK+ strings explicitly, implicit conversion doesn't
happen in STL build and may be wrong anyhow as it doesn't necessarily convert
the strings to UTF-8 expected by GTK+.

Closes #13703.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-11-30 09:16:44 +00:00
parent d9fc8e993a
commit f0776dc43f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/webview_webkit.cpp
View File

@@ -50,7 +50,12 @@ wxgtk_webview_webkit_load_status(GtkWidget* widget,
//with a custom scheme. //with a custom scheme.
if(WEBKIT_IS_WEB_HISTORY_ITEM(item) && webkit_web_history_item_get_uri(item) != url) if(WEBKIT_IS_WEB_HISTORY_ITEM(item) && webkit_web_history_item_get_uri(item) != url)
{ {
WebKitWebHistoryItem* newitem = webkit_web_history_item_new_with_data(url, webKitCtrl->GetCurrentTitle()); WebKitWebHistoryItem*
newitem = webkit_web_history_item_new_with_data
(
url.utf8_str(),
webKitCtrl->GetCurrentTitle().utf8_str()
);
webkit_web_back_forward_list_add_item(hist, newitem); webkit_web_back_forward_list_add_item(hist, newitem);
} }
@@ -368,7 +373,7 @@ wxgtk_webview_webkit_resource_req(WebKitWebView *,
wxString mime = file->GetMimeType(); wxString mime = file->GetMimeType();
wxString path = "data:" + mime + ";base64," + data; wxString path = "data:" + mime + ";base64," + data;
//Then we can redirect the call //Then we can redirect the call
webkit_network_request_set_uri(request, path); webkit_network_request_set_uri(request, path.utf8_str());
} }
} }
@@ -437,7 +442,7 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
PostCreation(size); PostCreation(size);
/* Open a webpage */ /* Open a webpage */
webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), url); webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), url.utf8_str());
//Get the initial history limit so we can enable and disable it later //Get the initial history limit so we can enable and disable it later
WebKitWebBackForwardList* history; WebKitWebBackForwardList* history;