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

Use correct signature for callback

Browse Source
This commit is contained in:
Paul Cornett
2017-06-18 13:56:06 -07:00
parent 74bde5690c
commit 59acf5ac27
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/webview_webkit2.cpp
View File

@@ -801,11 +801,15 @@ wxString wxWebViewWebKit::GetCurrentTitle() const
}
static void wxgtk_web_resource_get_data_cb(WebKitWebResource *,
extern "C" {
static void wxgtk_web_resource_get_data_cb(GObject*,
GAsyncResult *res,
GAsyncResult **res_out)
void* user_data)
{
*res_out = (GAsyncResult*)g_object_ref(res);
GAsyncResult** res_out = static_cast<GAsyncResult**>(user_data);
g_object_ref(res);
*res_out = res;
}
}
wxString wxWebViewWebKit::GetPageSource() const
@@ -818,7 +822,7 @@ wxString wxWebViewWebKit::GetPageSource() const
GAsyncResult *result = NULL;
webkit_web_resource_get_data(resource, NULL,
(GAsyncReadyCallback)wxgtk_web_resource_get_data_cb,
wxgtk_web_resource_get_data_cb,
&result);
GMainContext *main_context = g_main_context_get_thread_default();