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-15 09:27:19 -07:00
parent b4a6f39ab2
commit e03fd314fd
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

@@ -700,11 +700,15 @@ void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
} }
} }
static void wxgtk_can_execute_editing_command_cb(WebKitWebView *, extern "C" {
static void wxgtk_can_execute_editing_command_cb(GObject*,
GAsyncResult *res, 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;
}
} }
bool wxWebViewWebKit::CanExecuteEditingCommand(const gchar* command) const bool wxWebViewWebKit::CanExecuteEditingCommand(const gchar* command) const
@@ -713,7 +717,7 @@ bool wxWebViewWebKit::CanExecuteEditingCommand(const gchar* command) const
webkit_web_view_can_execute_editing_command(m_web_view, webkit_web_view_can_execute_editing_command(m_web_view,
command, command,
NULL, NULL,
(GAsyncReadyCallback)wxgtk_can_execute_editing_command_cb, wxgtk_can_execute_editing_command_cb,
&result); &result);
GMainContext *main_context = g_main_context_get_thread_default(); GMainContext *main_context = g_main_context_get_thread_default();