From 05857e66c0cb2b15e9a6c90dda089c3233c4e865 Mon Sep 17 00:00:00 2001 From: VZ Date: Wed, 23 Nov 2016 16:25:09 +0100 Subject: [PATCH] Declare Objective-C protocols in the code using web view This avoids clang -Wincompatible-pointer-types warnings when setting delegates. --- src/html/htmlctrl/webkit/webkit.mm | 6 +++--- src/osx/webview_webkit.mm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm index 138d753cc1..7a7b41a55e 100644 --- a/src/html/htmlctrl/webkit/webkit.mm +++ b/src/html/htmlctrl/webkit/webkit.mm @@ -130,7 +130,7 @@ inline int wxNavTypeFromWebNavType(int type){ return wxWEBKIT_NAV_OTHER; } -@interface MyFrameLoadMonitor : NSObject +@interface MyFrameLoadMonitor : NSObject { wxWebKitCtrl* webKitWindow; } @@ -139,7 +139,7 @@ inline int wxNavTypeFromWebNavType(int type){ @end -@interface MyPolicyDelegate : NSObject +@interface MyPolicyDelegate : NSObject { wxWebKitCtrl* webKitWindow; } @@ -148,7 +148,7 @@ inline int wxNavTypeFromWebNavType(int type){ @end -@interface MyUIDelegate : NSObject +@interface MyUIDelegate : NSObject { wxWebKitCtrl* webKitWindow; } diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm index b4f87909e7..1c8e4f03f9 100644 --- a/src/osx/webview_webkit.mm +++ b/src/osx/webview_webkit.mm @@ -50,7 +50,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView); wxBEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl) wxEND_EVENT_TABLE() -@interface WebViewLoadDelegate : NSObject +@interface WebViewLoadDelegate : NSObject { wxWebViewWebKit* webKitWindow; } @@ -59,7 +59,7 @@ wxEND_EVENT_TABLE() @end -@interface WebViewPolicyDelegate : NSObject +@interface WebViewPolicyDelegate : NSObject { wxWebViewWebKit* webKitWindow; } @@ -68,7 +68,7 @@ wxEND_EVENT_TABLE() @end -@interface WebViewUIDelegate : NSObject +@interface WebViewUIDelegate : NSObject { wxWebViewWebKit* webKitWindow; }