Fix uninitialized variable warning in wxMSW wxFileSystemWatcher code.

[wxWidgets.git] / src / osx / webview_webkit.mm

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index e6923c2b5073326d83cc0b2682ffc42b71825466..883fba00f24291fc894a7bb0929e6102835df82d 100644 (file)
--- a/src/osx/webview_webkit.mm
+++ b/src/osx/webview_webkit.mm
@@ -14,8 +14,8 @@
 
 #include "wx/osx/webview_webkit.h"
 
 
 #include "wx/osx/webview_webkit.h"
 

-#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
-                         ||  defined(__WXOSX_CARBON__))
+#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
+                                          ||  defined(__WXOSX_CARBON__))

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -24,22 +24,17 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#ifdef __WXCOCOA__
-#include "wx/cocoa/autorelease.h"
-#else

 #include "wx/osx/private.h"
 #include "wx/osx/private.h"

+#include "wx/cocoa/string.h"
+#include "wx/hashmap.h"
+#include "wx/filesys.h"

 
 #include <WebKit/WebKit.h>
 #include <WebKit/HIWebView.h>
 #include <WebKit/CarbonUtils.h>
 
 #include <WebKit/WebKit.h>
 #include <WebKit/HIWebView.h>
 #include <WebKit/CarbonUtils.h>

-#endif

 
 #include <Foundation/NSURLError.h>
 
 
 #include <Foundation/NSURLError.h>
 

-// FIXME: find cleaner way to find the wxWidgets ID of a webview than this hack
-#include <map>
-std::map<WebView*, wxWebViewWebKit*> wx_webviewctrls;
-

 #define DEBUG_WEBKIT_SIZING 0
 
 // ----------------------------------------------------------------------------
 #define DEBUG_WEBKIT_SIZING 0
 
 // ----------------------------------------------------------------------------


@@ -302,29 +297,7 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
 
 #endif
 
 
 #endif
 

-//---------------------------------------------------------
-// helper functions for NSString<->wxString conversion
-//---------------------------------------------------------
-
-inline wxString wxStringWithNSString(NSString *nsstring)
-{
-#if wxUSE_UNICODE
-    return wxString([nsstring UTF8String], wxConvUTF8);
-#else
-    return wxString([nsstring lossyCString]);
-#endif // wxUSE_UNICODE
-}
-
-inline NSString* wxNSStringWithWxString(const wxString &wxstring)
-{
-#if wxUSE_UNICODE
-    return [NSString stringWithUTF8String: wxstring.mb_str(wxConvUTF8)];
-#else
-    return [NSString stringWithCString: wxstring.c_str() length:wxstring.Len()];
-#endif // wxUSE_UNICODE
-}
-
-@interface MyFrameLoadMonitor : NSObject
+@interface WebViewLoadDelegate : NSObject

 {
     wxWebViewWebKit* webKitWindow;
 }
 {
     wxWebViewWebKit* webKitWindow;
 }


@@ -333,7 +306,7 @@ inline NSString* wxNSStringWithWxString(const wxString &wxstring)
 
 @end
 
 
 @end
 

-@interface MyPolicyDelegate : NSObject
+@interface WebViewPolicyDelegate : NSObject

 {
     wxWebViewWebKit* webKitWindow;
 }
 {
     wxWebViewWebKit* webKitWindow;
 }


@@ -342,6 +315,16 @@ inline NSString* wxNSStringWithWxString(const wxString &wxstring)
 
 @end
 
 
 @end
 

+//We use a hash to map scheme names to wxWebViewHandler
+WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxWebViewHandler>, wxStringToWebHandlerMap);
+
+static wxStringToWebHandlerMap g_stringHandlerMap;
+
+@interface WebViewCustomProtocol : NSURLProtocol
+{
+}
+@end
+

 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------


@@ -354,129 +337,81 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
                                  const wxString& name)
 {
     m_busy = false;
                                  const wxString& name)
 {
     m_busy = false;

-    //m_pageTitle = _("Untitled Page");

 
 

- //still needed for wxCocoa??
-/*
-    int width, height;
-    wxSize sizeInstance;
-    if (size.x == wxDefaultCoord || size.y == wxDefaultCoord)
-    {
-        m_parent->GetClientSize(&width, &height);
-        sizeInstance.x = width;
-        sizeInstance.y = height;
-    }
-    else
-    {
-        sizeInstance.x = size.x;
-        sizeInstance.y = size.y;
-    }
-*/
-    // now create and attach WebKit view...
-#ifdef __WXCOCOA__
-    wxControl::Create(parent, m_windowID, pos, sizeInstance, style, name);
-    SetSize(pos.x, pos.y, sizeInstance.x, sizeInstance.y);
-
-    wxTopLevelWindowCocoa *topWin = wxDynamicCast(this, wxTopLevelWindowCocoa);
-    NSWindow* nsWin = topWin->GetNSWindow();
-    NSRect rect;
-    rect.origin.x = pos.x;
-    rect.origin.y = pos.y;
-    rect.size.width = sizeInstance.x;
-    rect.size.height = sizeInstance.y;
-    m_webView = (WebView*)[[WebView alloc] initWithFrame:rect
-                                               frameName:@"webkitFrame"
-                                               groupName:@"webkitGroup"];
-    SetNSView(m_webView);
-    [m_cocoaNSView release];
-
-    if(m_parent) m_parent->CocoaAddChild(this);
-    SetInitialFrameRect(pos,sizeInstance);
-#else
+    DontCreatePeer();

     wxControl::Create(parent, winID, pos, size, style, wxDefaultValidator, name);
 
 #if wxOSX_USE_CARBON
     wxControl::Create(parent, winID, pos, size, style, wxDefaultValidator, name);
 
 #if wxOSX_USE_CARBON

-    m_peer = new wxMacControl(this);
+    wxMacControl* peer = new wxMacControl(this);

     WebInitForCarbon();
     WebInitForCarbon();

-    HIWebViewCreate( m_peer->GetControlRefAddr() );
+    HIWebViewCreate( peer->GetControlRefAddr() );

 
 

-    m_webView = (WebView*) HIWebViewGetWebView( m_peer->GetControlRef() );
+    m_webView = (WebView*) HIWebViewGetWebView( peer->GetControlRef() );

 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
     if ( UMAGetSystemVersion() >= 0x1030 )
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
     if ( UMAGetSystemVersion() >= 0x1030 )

-        HIViewChangeFeatures( m_peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
+        HIViewChangeFeatures( peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;

 #endif
 #endif

-    InstallControlEventHandler(m_peer->GetControlRef(),
+    InstallControlEventHandler(peer->GetControlRef(),

                                GetwxWebViewWebKitEventHandlerUPP(),
                                GetEventTypeCount(eventList), eventList, this,
                               (EventHandlerRef *)&m_webKitCtrlEventHandler);
                                GetwxWebViewWebKitEventHandlerUPP(),
                                GetEventTypeCount(eventList), eventList, this,
                               (EventHandlerRef *)&m_webKitCtrlEventHandler);

+    SetPeer(peer);

 #else
     NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
     m_webView = [[WebView alloc] initWithFrame:r
                                      frameName:@"webkitFrame"
                                      groupName:@"webkitGroup"];
 #else
     NSRect r = wxOSXGetFrameForControl( this, pos , size ) ;
     m_webView = [[WebView alloc] initWithFrame:r
                                      frameName:@"webkitFrame"
                                      groupName:@"webkitGroup"];

-    m_peer = new wxWidgetCocoaImpl( this, m_webView );
+    SetPeer(new wxWidgetCocoaImpl( this, m_webView ));

 #endif
 
 #endif
 

-    wx_webviewctrls[m_webView] = this;
-

     MacPostControlCreate(pos, size);
 
 #if wxOSX_USE_CARBON
     MacPostControlCreate(pos, size);
 
 #if wxOSX_USE_CARBON

-    HIViewSetVisible( m_peer->GetControlRef(), true );
+    HIViewSetVisible( GetPeer()->GetControlRef(), true );

 #endif
     [m_webView setHidden:false];
 
 #endif
     [m_webView setHidden:false];
 

-#endif
+

 
     // Register event listener interfaces
 
     // Register event listener interfaces

-    MyFrameLoadMonitor* myFrameLoadMonitor =
-            [[MyFrameLoadMonitor alloc] initWithWxWindow: this];
+    WebViewLoadDelegate* loadDelegate =
+            [[WebViewLoadDelegate 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];
-    
-    // add history
-    WebHistory* history = [[WebHistory alloc] init];
-    [WebHistory setOptionalSharedHistory:history];
+    [m_webView setPolicyDelegate:policyDelegate];

 
 

-    InternalLoadURL(strURL);
+    //Register our own class for custom scheme handling
+    [NSURLProtocol registerClass:[WebViewCustomProtocol class]];
+
+    LoadURL(strURL);

     return true;
 }
 
 wxWebViewWebKit::~wxWebViewWebKit()
 {
     return true;
 }
 
 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];

 }
 
 // ----------------------------------------------------------------------------
 // public methods
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // public methods
 // ----------------------------------------------------------------------------
 

-void wxWebViewWebKit::InternalLoadURL(const wxString &url)
-{
-    if( !m_webView )
-        return;
-
-    [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
-            [NSURL URLWithString:wxNSStringWithWxString(url)]]];
-}
-
-bool wxWebViewWebKit::CanGoBack()
+bool wxWebViewWebKit::CanGoBack() const

 {
     if ( !m_webView )
         return false;
 {
     if ( !m_webView )
         return false;


@@ -484,7 +419,7 @@ bool wxWebViewWebKit::CanGoBack()
     return [m_webView canGoBack];
 }
 
     return [m_webView canGoBack];
 }
 

-bool wxWebViewWebKit::CanGoForward()
+bool wxWebViewWebKit::CanGoForward() const

 {
     if ( !m_webView )
         return false;
 {
     if ( !m_webView )
         return false;


@@ -497,10 +432,7 @@ void wxWebViewWebKit::GoBack()
     if ( !m_webView )
         return;
 
     if ( !m_webView )
         return;
 

-    bool result = [(WebView*)m_webView goBack];
-
-    // TODO: return result (if it also exists in other backends...)
-    //return result;
+    [(WebView*)m_webView goBack];

 }
 
 void wxWebViewWebKit::GoForward()
 }
 
 void wxWebViewWebKit::GoForward()


@@ -508,10 +440,7 @@ void wxWebViewWebKit::GoForward()
     if ( !m_webView )
         return;
 
     if ( !m_webView )
         return;
 

-    bool result = [(WebView*)m_webView goForward];
-
-    // TODO: return result (if it also exists in other backends...)
-    //return result;
+    [(WebView*)m_webView goForward];

 }
 
 void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
 }
 
 void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)


@@ -540,7 +469,7 @@ void wxWebViewWebKit::Stop()
     [[m_webView mainFrame] stopLoading];
 }
 
     [[m_webView mainFrame] stopLoading];
 }
 

-bool wxWebViewWebKit::CanGetPageSource()
+bool wxWebViewWebKit::CanGetPageSource() const

 {
     if ( !m_webView )
         return false;
 {
     if ( !m_webView )
         return false;


@@ -549,7 +478,7 @@ bool wxWebViewWebKit::CanGetPageSource()
     return ( [[dataSource representation] canProvideDocumentSource] );
 }
 
     return ( [[dataSource representation] canProvideDocumentSource] );
 }
 

-wxString wxWebViewWebKit::GetPageSource()
+wxString wxWebViewWebKit::GetPageSource() const

 {
 
     if (CanGetPageSource())
 {
 
     if (CanGetPageSource())


@@ -572,7 +501,7 @@ wxString wxWebViewWebKit::GetPageSource()
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

-bool wxWebViewWebKit::CanIncreaseTextSize()
+bool wxWebViewWebKit::CanIncreaseTextSize() const

 {
     if ( !m_webView )
         return false;
 {
     if ( !m_webView )
         return false;


@@ -592,7 +521,7 @@ void wxWebViewWebKit::IncreaseTextSize()
         [m_webView makeTextLarger:(WebView*)m_webView];
 }
 
         [m_webView makeTextLarger:(WebView*)m_webView];
 }
 

-bool wxWebViewWebKit::CanDecreaseTextSize()
+bool wxWebViewWebKit::CanDecreaseTextSize() const

 {
     if ( !m_webView )
         return false;
 {
     if ( !m_webView )
         return false;


@@ -628,7 +557,7 @@ void wxWebViewWebKit::Print()
     {
         [op setShowsPrintPanel: showPrompt];
         // in my tests, the progress bar always freezes and it stops the whole
     {
         [op setShowsPrintPanel: showPrompt];
         // in my tests, the progress bar always freezes and it stops the whole

-        // print operation. do not turn this to true unless there is a 
+        // print operation. do not turn this to true unless there is a

         // workaround for the bug.
         [op setShowsProgressPanel: false];
     }
         // workaround for the bug.
         [op setShowsProgressPanel: false];
     }


@@ -644,7 +573,7 @@ void wxWebViewWebKit::SetEditable(bool enable)
     [m_webView setEditable:enable ];
 }
 
     [m_webView setEditable:enable ];
 }
 

-bool wxWebViewWebKit::IsEditable()
+bool wxWebViewWebKit::IsEditable() const

 {
     if ( !m_webView )
         return false;
 {
     if ( !m_webView )
         return false;


@@ -700,7 +629,7 @@ void wxWebViewWebKit::SetScrollPos(int pos)
             (NSString*)wxNSStringWithWxString( javascript )];
 }
 
             (NSString*)wxNSStringWithWxString( javascript )];
 }
 

-wxString wxWebViewWebKit::GetSelectedText()
+wxString wxWebViewWebKit::GetSelectedText() const

 {
     NSString* selection = [[m_webView selectedDOMRange] markupString];
     if (!selection) return wxEmptyString;
 {
     NSString* selection = [[m_webView selectedDOMRange] markupString];
     if (!selection) return wxEmptyString;


@@ -719,7 +648,7 @@ void wxWebViewWebKit::RunScript(const wxString& javascript)
 
 void wxWebViewWebKit::OnSize(wxSizeEvent &event)
 {
 
 void wxWebViewWebKit::OnSize(wxSizeEvent &event)
 {

-#if defined(__WXMAC_) && wxOSX_USE_CARBON
+#if defined(__WXMAC__) && wxOSX_USE_CARBON

     // This is a nasty hack because WebKit seems to lose its position when it is
     // embedded in a control that is not itself the content view for a TLW.
     // I put it in OnSize because these calcs are not perfect, and in fact are
     // This is a nasty hack because WebKit seems to lose its position when it is
     // embedded in a control that is not itself the content view for a TLW.
     // I put it in OnSize because these calcs are not perfect, and in fact are


@@ -765,7 +694,7 @@ void wxWebViewWebKit::OnSize(wxSizeEvent &event)
     // we want is the root view, because we need to make the y origin relative
     // to the very top of the window, not its contents, since we later flip
     // the y coordinate for Cocoa.
     // we want is the root view, because we need to make the y origin relative
     // to the very top of the window, not its contents, since we later flip
     // the y coordinate for Cocoa.

-    HIViewConvertRect (&rect, m_peer->GetControlRef(),
+    HIViewConvertRect (&rect, GetPeer()->GetControlRef(),

                                 HIViewGetRoot(
                                     (WindowRef) MacGetTopLevelWindowRef()
                                  ));
                                 HIViewGetRoot(
                                     (WindowRef) MacGetTopLevelWindowRef()
                                  ));


@@ -798,7 +727,7 @@ void wxWebViewWebKit::OnSize(wxSizeEvent &event)
 
 void wxWebViewWebKit::MacVisibilityChanged(){
 #if defined(__WXMAC__) && wxOSX_USE_CARBON
 
 void wxWebViewWebKit::MacVisibilityChanged(){
 #if defined(__WXMAC__) && wxOSX_USE_CARBON

-    bool isHidden = !IsControlVisible( m_peer->GetControlRef());
+    bool isHidden = !IsControlVisible( GetPeer()->GetControlRef());

     if (!isHidden)
         [(WebView*)m_webView display];
 
     if (!isHidden)
         [(WebView*)m_webView display];
 


@@ -806,22 +735,23 @@ void wxWebViewWebKit::MacVisibilityChanged(){
 #endif
 }
 
 #endif
 }
 

-void wxWebViewWebKit::LoadUrl(const wxString& url)
+void wxWebViewWebKit::LoadURL(const wxString& url)

 {
 {

-    InternalLoadURL(url);
+    [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
+            [NSURL URLWithString:wxNSStringWithWxString(url)]]];

 }
 
 }
 

-wxString wxWebViewWebKit::GetCurrentURL()
+wxString wxWebViewWebKit::GetCurrentURL() const

 {
     return wxStringWithNSString([m_webView mainFrameURL]);
 }
 
 {
     return wxStringWithNSString([m_webView mainFrameURL]);
 }
 

-wxString wxWebViewWebKit::GetCurrentTitle()
+wxString wxWebViewWebKit::GetCurrentTitle() const

 {
 {

-    return GetPageTitle();
+    return wxStringWithNSString([m_webView mainFrameTitle]);

 }
 
 }
 

-float wxWebViewWebKit::GetWebkitZoom()
+float wxWebViewWebKit::GetWebkitZoom() const

 {
     return [m_webView textSizeMultiplier];
 }
 {
     return [m_webView textSizeMultiplier];
 }


@@ -831,7 +761,7 @@ void wxWebViewWebKit::SetWebkitZoom(float zoom)
     [m_webView setTextSizeMultiplier:zoom];
 }
 
     [m_webView setTextSizeMultiplier:zoom];
 }
 

-wxWebViewZoom wxWebViewWebKit::GetZoom()
+wxWebViewZoom wxWebViewWebKit::GetZoom() const

 {
     float zoom = GetWebkitZoom();
 
 {
     float zoom = GetWebkitZoom();
 


@@ -935,7 +865,7 @@ void wxWebViewWebKit::DeleteSelection()
     [(WebView*)m_webView deleteSelection];
 }
 
     [(WebView*)m_webView deleteSelection];
 }
 

-bool wxWebViewWebKit::HasSelection()
+bool wxWebViewWebKit::HasSelection() const

 {
     DOMRange* range = [m_webView selectedDOMRange];
     if(!range)
 {
     DOMRange* range = [m_webView selectedDOMRange];
     if(!range)


@@ -948,6 +878,35 @@ bool wxWebViewWebKit::HasSelection()
     }
 }
 
     }
 }
 

+void wxWebViewWebKit::ClearSelection()
+{
+    //We use javascript as selection isn't exposed at the moment in webkit
+    RunScript("window.getSelection().removeAllRanges();");
+}
+
+void wxWebViewWebKit::SelectAll()
+{
+    RunScript("window.getSelection().selectAllChildren(document.body);");
+}
+
+wxString wxWebViewWebKit::GetSelectedSource() const
+{
+    wxString script = ("var range = window.getSelection().getRangeAt(0);"
+                       "var element = document.createElement('div');"
+                       "element.appendChild(range.cloneContents());"
+                       "return element.innerHTML;");
+    id result = [[m_webView windowScriptObject]
+                   evaluateWebScript:wxNSStringWithWxString(script)];
+    return wxStringWithNSString([result stringValue]);
+}
+
+wxString wxWebViewWebKit::GetPageText() const
+{
+    id result = [[m_webView windowScriptObject]
+                 evaluateWebScript:@"document.body.textContent"];
+    return wxStringWithNSString([result stringValue]);
+}
+

 void wxWebViewWebKit::EnableHistory(bool enable)
 {
     if ( !m_webView )
 void wxWebViewWebKit::EnableHistory(bool enable)
 {
     if ( !m_webView )


@@ -958,15 +917,57 @@ void wxWebViewWebKit::EnableHistory(bool enable)
 
 void wxWebViewWebKit::ClearHistory()
 {
 
 void wxWebViewWebKit::ClearHistory()
 {

-    [[WebHistory optionalSharedHistory] removeAllItems];
+    [m_webView setMaintainsBackForwardList:NO];
+    [m_webView setMaintainsBackForwardList:YES];

 }
 
 }
 

-bool wxWebViewWebKit::CanUndo()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
+{
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;
+    WebBackForwardList* history = [m_webView backForwardList];
+    int count = [history backListCount];
+    for(int i = -count; i < 0; i++)
+    {
+        WebHistoryItem* item = [history itemAtIndex:i];
+        wxString url = wxStringWithNSString([item URLString]);
+        wxString title = wxStringWithNSString([item title]);
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(url, title);
+        wxitem->m_histItem = item;
+        wxSharedPtr<wxWebViewHistoryItem> itemptr(wxitem);
+        backhist.push_back(itemptr);
+    }
+    return backhist;
+}
+
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()
+{
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;
+    WebBackForwardList* history = [m_webView backForwardList];
+    int count = [history forwardListCount];
+    for(int i = 1; i <= count; i++)
+    {
+        WebHistoryItem* item = [history itemAtIndex:i];
+        wxString url = wxStringWithNSString([item URLString]);
+        wxString title = wxStringWithNSString([item title]);
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(url, title);
+        wxitem->m_histItem = item;
+        wxSharedPtr<wxWebViewHistoryItem> itemptr(wxitem);
+        forwardhist.push_back(itemptr);
+    }
+    return forwardhist;
+}
+
+void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
+{
+    [m_webView goToBackForwardItem:item->m_histItem];
+}
+
+bool wxWebViewWebKit::CanUndo() const

 {
     return [[m_webView undoManager] canUndo];
 }
 
 {
     return [[m_webView undoManager] canUndo];
 }
 

-bool wxWebViewWebKit::CanRedo()
+bool wxWebViewWebKit::CanRedo() const

 {
     return [[m_webView undoManager] canRedo];
 }
 {
     return [[m_webView undoManager] canRedo];
 }


@@ -981,6 +982,11 @@ void wxWebViewWebKit::Redo()
     [[m_webView undoManager] redo];
 }
 
     [[m_webView undoManager] redo];
 }
 

+void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)
+{
+    g_stringHandlerMap[handler->GetName()] = handler;
+}
+

 //------------------------------------------------------------
 // Listener interfaces
 //------------------------------------------------------------
 //------------------------------------------------------------
 // Listener interfaces
 //------------------------------------------------------------


@@ -990,7 +996,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
 {


@@ -1002,48 +1008,45 @@ void wxWebViewWebKit::Redo()
 - (void)webView:(WebView *)sender
     didStartProvisionalLoadForFrame:(WebFrame *)frame
 {
 - (void)webView:(WebView *)sender
     didStartProvisionalLoadForFrame:(WebFrame *)frame
 {

-       wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
-    wx_webviewctrls[sender]->m_busy = true;
+    webKitWindow->m_busy = true;

 }
 
 - (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame
 {
 }
 
 - (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame
 {

-       wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
-    wx_webviewctrls[sender]->m_busy = true;
+    webKitWindow->m_busy = true;

 
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
         wxString target = wxStringWithNSString([frame name]);
 
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
         wxString target = wxStringWithNSString([frame name]);

-        wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
-                                       wx_webviewctrls[sender]->GetId(),
-                                       wxStringWithNSString( url ),
-                                       target, false);
+        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+                             webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             target);

 
         if (webKitWindow && webKitWindow->GetEventHandler())
 
         if (webKitWindow && webKitWindow->GetEventHandler())

-            webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+            webKitWindow->GetEventHandler()->ProcessEvent(event);

     }
 }
 
 - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
 {
     }
 }
 
 - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
 {

-       wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
-    wx_webviewctrls[sender]->m_busy = false;
+    webKitWindow->m_busy = false;

 
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
 
         wxString target = wxStringWithNSString([frame name]);
 
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
 
         wxString target = wxStringWithNSString([frame name]);

-        wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_LOADED,
-                                       wx_webviewctrls[sender]->GetId(),
-                                       wxStringWithNSString( url ),
-                                       target, false);
+        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED,
+                             webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             target);

 
         if (webKitWindow && webKitWindow->GetEventHandler())
 
         if (webKitWindow && webKitWindow->GetEventHandler())

-            webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+            webKitWindow->GetEventHandler()->ProcessEvent(event);

     }
 }
 
     }
 }
 

-wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
+wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)

 {
     *out = wxWEB_NAV_ERR_OTHER;
 
 {
     *out = wxWEB_NAV_ERR_OTHER;
 


@@ -1059,7 +1062,9 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
 
             case NSURLErrorResourceUnavailable:
             case NSURLErrorHTTPTooManyRedirects:
 
             case NSURLErrorResourceUnavailable:
             case NSURLErrorHTTPTooManyRedirects:

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5

             case NSURLErrorDataLengthExceedsMaximum:
             case NSURLErrorDataLengthExceedsMaximum:

+#endif

             case NSURLErrorBadURL:
             case NSURLErrorFileIsDirectory:
                 *out = wxWEB_NAV_ERR_REQUEST;
             case NSURLErrorBadURL:
             case NSURLErrorFileIsDirectory:
                 *out = wxWEB_NAV_ERR_REQUEST;


@@ -1081,16 +1086,20 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
                 *out = wxWEB_NAV_ERR_USER_CANCELLED;
                 break;
 
                 *out = wxWEB_NAV_ERR_USER_CANCELLED;
                 break;
 

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5

             case NSURLErrorCannotDecodeRawData:
             case NSURLErrorCannotDecodeContentData:
             case NSURLErrorCannotDecodeRawData:
             case NSURLErrorCannotDecodeContentData:

-            case NSURLErrorBadServerResponse:

             case NSURLErrorCannotParseResponse:
             case NSURLErrorCannotParseResponse:

+#endif
+            case NSURLErrorBadServerResponse:

                 *out = wxWEB_NAV_ERR_REQUEST;
                 break;
 
             case NSURLErrorUserAuthenticationRequired:
             case NSURLErrorSecureConnectionFailed:
                 *out = wxWEB_NAV_ERR_REQUEST;
                 break;
 
             case NSURLErrorUserAuthenticationRequired:
             case NSURLErrorSecureConnectionFailed:

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6

             case NSURLErrorClientCertificateRequired:
             case NSURLErrorClientCertificateRequired:

+#endif

                 *out = wxWEB_NAV_ERR_AUTH;
                 break;
 
                 *out = wxWEB_NAV_ERR_AUTH;
                 break;
 


@@ -1120,24 +1129,23 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
 - (void)webView:(WebView *)sender didFailLoadWithError:(NSError*) error
         forFrame:(WebFrame *)frame
 {
 - (void)webView:(WebView *)sender didFailLoadWithError:(NSError*) error
         forFrame:(WebFrame *)frame
 {

-       wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
-    wx_webviewctrls[sender]->m_busy = false;
+    webKitWindow->m_busy = false;

 
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
 
 
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
 

-        wxWebNavigationError type;
+        wxWebViewNavigationError type;

         wxString description = nsErrorToWxHtmlError(error, &type);
         wxString description = nsErrorToWxHtmlError(error, &type);

-               wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
-                                              wx_webviewctrls[sender]->GetId(),
-                                       wxStringWithNSString( url ),
-                                       wxEmptyString, false);
-               thisEvent.SetString(description);
-               thisEvent.SetInt(type);
+               wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR,
+                                    webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             wxEmptyString);
+               event.SetString(description);
+               event.SetInt(type);

 
                if (webKitWindow && webKitWindow->GetEventHandler())
                {
 
                if (webKitWindow && webKitWindow->GetEventHandler())
                {

-                       webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+                       webKitWindow->GetEventHandler()->ProcessEvent(event);

                }
     }
 }
                }
     }
 }


@@ -1146,48 +1154,43 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
         didFailProvisionalLoadWithError:(NSError*)error
                                forFrame:(WebFrame *)frame
 {
         didFailProvisionalLoadWithError:(NSError*)error
                                forFrame:(WebFrame *)frame
 {

-       wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
-    wx_webviewctrls[sender]->m_busy = false;
+    webKitWindow->m_busy = false;

 
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame provisionalDataSource] request] URL]
                             absoluteString];
 
 
     if (webKitWindow && frame == [sender mainFrame]){
         NSString *url = [[[[frame provisionalDataSource] request] URL]
                             absoluteString];
 

-               wxWebNavigationError type;
+               wxWebViewNavigationError type;

         wxString description = nsErrorToWxHtmlError(error, &type);
         wxString description = nsErrorToWxHtmlError(error, &type);

-               wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
-                                              wx_webviewctrls[sender]->GetId(),
-                                       wxStringWithNSString( url ),
-                                       wxEmptyString, false);
-               thisEvent.SetString(description);
-               thisEvent.SetInt(type);
+               wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_ERROR,
+                                    webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             wxEmptyString);
+               event.SetString(description);
+               event.SetInt(type);

 
                if (webKitWindow && webKitWindow->GetEventHandler())
 
                if (webKitWindow && webKitWindow->GetEventHandler())

-                       webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+                       webKitWindow->GetEventHandler()->ProcessEvent(event);

     }
 }
 
 - (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title
                                          forFrame:(WebFrame *)frame
 {
     }
 }
 
 - (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title
                                          forFrame:(WebFrame *)frame
 {

-    if (webKitWindow && frame == [sender mainFrame])
-    {
-        webKitWindow->SetPageTitle(wxStringWithNSString( title ));
-    }

     wxString target = wxStringWithNSString([frame name]);
     wxString target = wxStringWithNSString([frame name]);

-    wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
-                                   wx_webviewctrls[sender]->GetId(),
-                                   wx_webviewctrls[sender]->GetCurrentURL(),
-                                   target, true);
-                                   
-    thisEvent.SetString(wxStringWithNSString(title));
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
+                         webKitWindow->GetId(),
+                         webKitWindow->GetCurrentURL(),
+                         target);
+
+    event.SetString(wxStringWithNSString(title));

 
     if (webKitWindow && webKitWindow->GetEventHandler())
 
     if (webKitWindow && webKitWindow->GetEventHandler())

-        webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+        webKitWindow->GetEventHandler()->ProcessEvent(event);

 }
 @end
 
 }
 @end
 

-@implementation MyPolicyDelegate
+@implementation WebViewPolicyDelegate

 
 - initWithWxWindow: (wxWebViewWebKit*)inWindow
 {
 
 - initWithWxWindow: (wxWebViewWebKit*)inWindow
 {


@@ -1204,20 +1207,19 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
 {
     wxUnusedVar(frame);
 
 {
     wxUnusedVar(frame);
 

-    wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
-    wx_webviewctrls[sender]->m_busy = true;
+    webKitWindow->m_busy = true;

     NSString *url = [[request URL] absoluteString];
     wxString target = wxStringWithNSString([frame name]);
     NSString *url = [[request URL] absoluteString];
     wxString target = wxStringWithNSString([frame name]);

-    wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
-                                   wx_webviewctrls[sender]->GetId(),
-                                   wxStringWithNSString( url ), target, true);
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
+                         webKitWindow->GetId(),
+                         wxStringWithNSString( url ), target);

 
     if (webKitWindow && webKitWindow->GetEventHandler())
 
     if (webKitWindow && webKitWindow->GetEventHandler())

-        webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+        webKitWindow->GetEventHandler()->ProcessEvent(event);

 
 

-    if (thisEvent.IsVetoed())
+    if (!event.IsAllowed())

     {
     {

-        wx_webviewctrls[sender]->m_busy = false;
+        webKitWindow->m_busy = false;

         [listener ignore];
     }
     else
         [listener ignore];
     }
     else


@@ -1226,25 +1228,91 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
     }
 }
 
     }
 }
 

-- (void)webView:(WebView *)sender 
+- (void)webView:(WebView *)sender

       decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
                              request:(NSURLRequest *)request
                         newFrameName:(NSString *)frameName
                     decisionListener:(id < WebPolicyDecisionListener >)listener
 {
     wxUnusedVar(actionInformation);
       decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
                              request:(NSURLRequest *)request
                         newFrameName:(NSString *)frameName
                     decisionListener:(id < WebPolicyDecisionListener >)listener
 {
     wxUnusedVar(actionInformation);

-    
-    wxASSERT(wx_webviewctrls.find(sender) != wx_webviewctrls.end());
+

     NSString *url = [[request URL] absoluteString];
     NSString *url = [[request URL] absoluteString];

-    wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
-                                   wx_webviewctrls[sender]->GetId(),
-                                   wxStringWithNSString( url ), "", true);
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
+                         webKitWindow->GetId(),
+                         wxStringWithNSString( url ), "");

 
     if (webKitWindow && webKitWindow->GetEventHandler())
 
     if (webKitWindow && webKitWindow->GetEventHandler())

-        webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+        webKitWindow->GetEventHandler()->ProcessEvent(event);

 
     [listener ignore];
 }
 @end
 
 
     [listener ignore];
 }
 @end
 

-#endif //wxUSE_WEBVIEW_WEBKIT
+@implementation WebViewCustomProtocol
+
++ (BOOL)canInitWithRequest:(NSURLRequest *)request
+{
+    NSString *scheme = [[request URL] scheme];
+
+    wxStringToWebHandlerMap::const_iterator it;
+    for( it = g_stringHandlerMap.begin(); it != g_stringHandlerMap.end(); ++it )
+    {
+        if(it->first.IsSameAs(wxStringWithNSString(scheme)))
+        {
+            return YES;
+        }
+    }
+
+       return NO;
+}
+
++ (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request
+{
+    //We don't do any processing here as the wxWebViewHandler classes do it
+    return request;
+}
+
+- (void)startLoading
+{
+    NSURLRequest *request = [self request];
+       NSString* path = [[request URL] absoluteString];
+
+    wxString wxpath = wxStringWithNSString(path);
+    wxString scheme = wxStringWithNSString([[request URL] scheme]);
+    wxFSFile* file = g_stringHandlerMap[scheme]->GetFile(wxpath);
+    size_t length = file->GetStream()->GetLength();
+
+
+    NSURLResponse *response =  [[NSURLResponse alloc] initWithURL:[request URL]
+                                          MIMEType:wxNSStringWithWxString(file->GetMimeType())
+                                          expectedContentLength:length
+                                          textEncodingName:nil];
+
+    //Load the data, we malloc it so it is tidied up properly
+    void* buffer = malloc(length);
+    file->GetStream()->Read(buffer, length);
+    NSData *data = [[NSData alloc] initWithBytesNoCopy:buffer length:length];
+
+    id<NSURLProtocolClient> client = [self client];
+
+    //We do not support caching anything yet
+       [client URLProtocol:self didReceiveResponse:response
+            cacheStoragePolicy:NSURLCacheStorageNotAllowed];
+
+    //Set the data
+       [client URLProtocol:self didLoadData:data];
+
+       //Notify that we have finished
+       [client URLProtocolDidFinishLoading:self];
+
+       [response release];
+}
+
+- (void)stopLoading
+{
+
+}
+
+@end
+
+#endif //wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT