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

Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-11 10:49:50 +00:00
parent b8a14a1708
commit d2e66707de
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/osx/webview_webkit.mm
View File

@@ -295,7 +295,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
#endif #endif
@interface MyFrameLoadMonitor : NSObject @interface WebViewLoadDelegate : NSObject
{ {
wxWebViewWebKit* webKitWindow; wxWebViewWebKit* webKitWindow;
} }
@@ -304,7 +304,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
@end @end
@interface MyPolicyDelegate : NSObject @interface WebViewPolicyDelegate : NSObject
{ {
wxWebViewWebKit* webKitWindow; wxWebViewWebKit* webKitWindow;
} }
@@ -363,16 +363,16 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
// Register event listener interfaces // Register event listener interfaces
MyFrameLoadMonitor* myFrameLoadMonitor = WebViewLoadDelegate* loadDelegate =
[[MyFrameLoadMonitor alloc] initWithWxWindow: this]; [[WebViewWebKitLoadDelegate alloc] initWithWxWindow: this];
[m_webView setFrameLoadDelegate:myFrameLoadMonitor]; [m_webView setFrameLoadDelegate:loadDelegate];
// this is used to veto page loads, etc. // this is used to veto page loads, etc.
MyPolicyDelegate* myPolicyDelegate = WebViewPolicyDelegate* policyDelegate =
[[MyPolicyDelegate alloc] initWithWxWindow: this]; [[WebViewPolicyDelegate alloc] initWithWxWindow: this];
[m_webView setPolicyDelegate:myPolicyDelegate]; [m_webView setPolicyDelegate:policyDelegate];
LoadUrl(strURL); LoadUrl(strURL);
return true; return true;
@@ -380,16 +380,16 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
wxWebViewWebKit::~wxWebViewWebKit() wxWebViewWebKit::~wxWebViewWebKit()
{ {
MyFrameLoadMonitor* myFrameLoadMonitor = [m_webView frameLoadDelegate]; WebViewLoadDelegate* loadDelegate = [m_webView frameLoadDelegate];
MyPolicyDelegate* myPolicyDelegate = [m_webView policyDelegate]; WebViewPolicyDelegate* policyDelegate = [m_webView policyDelegate];
[m_webView setFrameLoadDelegate: nil]; [m_webView setFrameLoadDelegate: nil];
[m_webView setPolicyDelegate: nil]; [m_webView setPolicyDelegate: nil];
if (myFrameLoadMonitor) if (loadDelegate)
[myFrameLoadMonitor release]; [loadDelegate release];
if (myPolicyDelegate) if (policyDelegate)
[myPolicyDelegate release]; [policyDelegate release];
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -976,7 +976,7 @@ void wxWebViewWebKit::Redo()
// destroyed. Therefore, we must be careful to check both the existence // destroyed. Therefore, we must be careful to check both the existence
// of the Carbon control and the event handler before firing events. // of the Carbon control and the event handler before firing events.
@implementation MyFrameLoadMonitor @implementation WebViewLoadDelegate
- initWithWxWindow: (wxWebViewWebKit*)inWindow - initWithWxWindow: (wxWebViewWebKit*)inWindow
{ {
@@ -1164,7 +1164,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
} }
@end @end
@implementation MyPolicyDelegate @implementation WebViewPolicyDelegate
- initWithWxWindow: (wxWebViewWebKit*)inWindow - initWithWxWindow: (wxWebViewWebKit*)inWindow
{ {