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

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 74f17913db711652b31be71149bc7a1905909461..e15efad4115ba9aae4602af9571bf4884deff6e1 100644 (file)
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -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 =
-            [[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.
 
     // 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;
 
     LoadUrl(strURL);
     return true;


@@ -380,16 +380,16 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
 
 wxWebViewWebKit::~wxWebViewWebKit()
 {
 
 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];
 
     [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.
 
 // 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
 {
 
 - 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
 {