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

Declare Objective-C protocols in the code using web view

Browse Source 
This avoids clang -Wincompatible-pointer-types warnings when setting
delegates.
This commit is contained in:
VZ
2016-11-23 16:25:09 +01:00
committed by GitHub
parent fe685bc4c6
commit 05857e66c0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/html/htmlctrl/webkit/webkit.mm
View File

@@ -130,7 +130,7 @@ inline int wxNavTypeFromWebNavType(int type){
return wxWEBKIT_NAV_OTHER; return wxWEBKIT_NAV_OTHER;
} }
@interface MyFrameLoadMonitor : NSObject @interface MyFrameLoadMonitor : NSObject <WebFrameLoadDelegate>
{ {
wxWebKitCtrl* webKitWindow; wxWebKitCtrl* webKitWindow;
} }
@@ -139,7 +139,7 @@ inline int wxNavTypeFromWebNavType(int type){
@end @end
@interface MyPolicyDelegate : NSObject @interface MyPolicyDelegate : NSObject <WebPolicyDelegate>
{ {
wxWebKitCtrl* webKitWindow; wxWebKitCtrl* webKitWindow;
} }
@@ -148,7 +148,7 @@ inline int wxNavTypeFromWebNavType(int type){
@end @end
@interface MyUIDelegate : NSObject @interface MyUIDelegate : NSObject <WebUIDelegate>
{ {
wxWebKitCtrl* webKitWindow; wxWebKitCtrl* webKitWindow;
} }

6
src/osx/webview_webkit.mm
View File

@@ -50,7 +50,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewWebKit, wxWebView);
wxBEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl) wxBEGIN_EVENT_TABLE(wxWebViewWebKit, wxControl)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
@interface WebViewLoadDelegate : NSObject @interface WebViewLoadDelegate : NSObject <WebFrameLoadDelegate>
{ {
wxWebViewWebKit* webKitWindow; wxWebViewWebKit* webKitWindow;
} }
@@ -59,7 +59,7 @@ wxEND_EVENT_TABLE()
@end @end
@interface WebViewPolicyDelegate : NSObject @interface WebViewPolicyDelegate : NSObject <WebPolicyDelegate>
{ {
wxWebViewWebKit* webKitWindow; wxWebViewWebKit* webKitWindow;
} }
@@ -68,7 +68,7 @@ wxEND_EVENT_TABLE()
@end @end
@interface WebViewUIDelegate : NSObject @interface WebViewUIDelegate : NSObject <WebUIDelegate>
{ {
wxWebViewWebKit* webKitWindow; wxWebViewWebKit* webKitWindow;
} }