From d2e66707deb10dea6f92e3e4092f8a43ef942a5d Mon Sep 17 00:00:00 2001
From: Steve Lamerton <steve.lamerton@gmail.com>
Date: Thu, 11 Aug 2011 10:49:50 +0000
Subject: [PATCH] Rename delegates to try and stop name clashes, probably with
 wxWebKitCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/osx/webview_webkit.mm | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

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