Add wxTimer::StartOnce().

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

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index f3efc4e2e542fce0d092ef3b06031d57fc3ff547..1609dfd59a388f83fd47f00e2939adb153256882 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"


@@ -103,7 +103,6 @@ static pascal OSStatus wxWebKitKeyEventHandler(EventHandlerCallRef handler,
 
     UInt32 keyCode ;
     UInt32 modifiers ;
 
     UInt32 keyCode ;
     UInt32 modifiers ;

-    Point point ;

     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
 #if wxUSE_UNICODE
     UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
 
 #if wxUSE_UNICODE


@@ -135,13 +134,11 @@ static pascal OSStatus wxWebKitKeyEventHandler(EventHandlerCallRef handler,
 #endif
 
     GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL,
 #endif
 
     GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL,

-                      sizeof(char), NULL, &charCode );
+                      1, NULL, &charCode );

     GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL,
                       sizeof(UInt32), NULL, &keyCode );
     GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL,
                       sizeof(UInt32), NULL, &modifiers );
     GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL,
                       sizeof(UInt32), NULL, &keyCode );
     GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL,
                       sizeof(UInt32), NULL, &modifiers );

-    GetEventParameter(event, kEventParamMouseLocation, typeQDPoint, NULL,
-                      sizeof(Point), NULL, &point );

 
     UInt32 message = (keyCode << 8) + charCode;
     switch ( GetEventKind( event ) )
 
     UInt32 message = (keyCode << 8) + charCode;
     switch ( GetEventKind( event ) )


@@ -155,7 +152,7 @@ static pascal OSStatus wxWebKitKeyEventHandler(EventHandlerCallRef handler,
 
             wxTheApp->MacSetCurrentEvent( event , handler ) ;
             if ( /* focus && */ wxTheApp->MacSendKeyDownEvent(
 
             wxTheApp->MacSetCurrentEvent( event , handler ) ;
             if ( /* focus && */ wxTheApp->MacSendKeyDownEvent(

-                focus, message, modifiers, when, point.h, point.v, uniChar[0]))
+                focus, message, modifiers, when, uniChar[0]))

             {
                 result = noErr ;
             }
             {
                 result = noErr ;
             }


@@ -165,7 +162,7 @@ static pascal OSStatus wxWebKitKeyEventHandler(EventHandlerCallRef handler,
 
         case kEventRawKeyUp :
             if ( /* focus && */ wxTheApp->MacSendKeyUpEvent(
 
         case kEventRawKeyUp :
             if ( /* focus && */ wxTheApp->MacSendKeyUpEvent(

-                focus , message , modifiers , when , point.h , point.v , uniChar[0] ) )
+                focus , message , modifiers , when , uniChar[0] ) )

             {
                 result = noErr ;
             }
             {
                 result = noErr ;
             }


@@ -179,8 +176,6 @@ static pascal OSStatus wxWebKitKeyEventHandler(EventHandlerCallRef handler,
                 event.m_controlDown = modifiers & controlKey;
                 event.m_altDown = modifiers & optionKey;
                 event.m_metaDown = modifiers & cmdKey;
                 event.m_controlDown = modifiers & controlKey;
                 event.m_altDown = modifiers & optionKey;
                 event.m_metaDown = modifiers & cmdKey;

-                event.m_x = point.h;
-                event.m_y = point.v;

 
 #if wxUSE_UNICODE
                 event.m_uniChar = uniChar[0] ;
 
 #if wxUSE_UNICODE
                 event.m_uniChar = uniChar[0] ;


@@ -315,8 +310,17 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebViewWebKitEventHandler )
 
 @end
 
 
 @end
 

-//We use a hash to map scheme names to wxWebHandlers
-WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxWebHandler>, wxStringToWebHandlerMap);
+@interface WebViewUIDelegate : NSObject
+{
+    wxWebViewWebKit* webKitWindow;
+}
+
+- initWithWxWindow: (wxWebViewWebKit*)inWindow;
+
+@end
+
+//We use a hash to map scheme names to wxWebViewHandler
+WX_DECLARE_STRING_HASH_MAP(wxSharedPtr<wxWebViewHandler>, wxStringToWebHandlerMap);

 
 static wxStringToWebHandlerMap g_stringHandlerMap;
 
 
 static wxStringToWebHandlerMap g_stringHandlerMap;
 


@@ -386,10 +390,15 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
 
     [m_webView setPolicyDelegate:policyDelegate];
 
 
     [m_webView setPolicyDelegate:policyDelegate];
 

+    WebViewUIDelegate* uiDelegate =
+            [[WebViewUIDelegate alloc] initWithWxWindow: this];
+
+    [m_webView setUIDelegate:uiDelegate];
+

     //Register our own class for custom scheme handling
     [NSURLProtocol registerClass:[WebViewCustomProtocol class]];
 
     //Register our own class for custom scheme handling
     [NSURLProtocol registerClass:[WebViewCustomProtocol class]];
 

-    LoadUrl(strURL);
+    LoadURL(strURL);

     return true;
 }
 
     return true;
 }
 


@@ -397,21 +406,26 @@ wxWebViewWebKit::~wxWebViewWebKit()
 {
     WebViewLoadDelegate* loadDelegate = [m_webView frameLoadDelegate];
     WebViewPolicyDelegate* policyDelegate = [m_webView policyDelegate];
 {
     WebViewLoadDelegate* loadDelegate = [m_webView frameLoadDelegate];
     WebViewPolicyDelegate* policyDelegate = [m_webView policyDelegate];

+    WebViewUIDelegate* uiDelegate = [m_webView UIDelegate];

     [m_webView setFrameLoadDelegate: nil];
     [m_webView setPolicyDelegate: nil];
     [m_webView setFrameLoadDelegate: nil];
     [m_webView setPolicyDelegate: nil];

+    [m_webView setUIDelegate: nil];

 
     if (loadDelegate)
         [loadDelegate release];
 
     if (policyDelegate)
         [policyDelegate release];
 
     if (loadDelegate)
         [loadDelegate release];
 
     if (policyDelegate)
         [policyDelegate release];

+
+    if (uiDelegate)
+        [uiDelegate release];

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

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

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


@@ -419,7 +433,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;


@@ -448,7 +462,7 @@ void wxWebViewWebKit::Reload(wxWebViewReloadFlags flags)
     if ( !m_webView )
         return;
 
     if ( !m_webView )
         return;
 

-    if (flags & wxWEB_VIEW_RELOAD_NO_CACHE)
+    if (flags & wxWEBVIEW_RELOAD_NO_CACHE)

     {
         // TODO: test this indeed bypasses the cache
         [[m_webView preferences] setUsesPageCache:NO];
     {
         // TODO: test this indeed bypasses the cache
         [[m_webView preferences] setUsesPageCache:NO];


@@ -469,7 +483,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;


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

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

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


@@ -501,7 +515,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;


@@ -521,7 +535,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;


@@ -557,7 +571,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];
     }


@@ -573,7 +587,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;


@@ -585,7 +599,7 @@ void wxWebViewWebKit::SetZoomType(wxWebViewZoomType zoomType)
 {
     // there is only one supported zoom type at the moment so this setter
     // does nothing beyond checking sanity
 {
     // there is only one supported zoom type at the moment so this setter
     // does nothing beyond checking sanity

-    wxASSERT(zoomType == wxWEB_VIEW_ZOOM_TYPE_TEXT);
+    wxASSERT(zoomType == wxWEBVIEW_ZOOM_TYPE_TEXT);

 }
 
 wxWebViewZoomType wxWebViewWebKit::GetZoomType() const
 }
 
 wxWebViewZoomType wxWebViewWebKit::GetZoomType() const


@@ -593,7 +607,7 @@ wxWebViewZoomType wxWebViewWebKit::GetZoomType() const
     // for now that's the only one that is supported
     // FIXME: does the default zoom type change depending on webkit versions? :S
     //        Then this will be wrong
     // for now that's the only one that is supported
     // FIXME: does the default zoom type change depending on webkit versions? :S
     //        Then this will be wrong

-    return wxWEB_VIEW_ZOOM_TYPE_TEXT;
+    return wxWEBVIEW_ZOOM_TYPE_TEXT;

 }
 
 bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType type) const
 }
 
 bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType type) const


@@ -603,7 +617,7 @@ bool wxWebViewWebKit::CanSetZoomType(wxWebViewZoomType type) const
         // for now that's the only one that is supported
         // TODO: I know recent versions of webkit support layout zoom too,
         //       check if we can support it
         // for now that's the only one that is supported
         // TODO: I know recent versions of webkit support layout zoom too,
         //       check if we can support it

-        case wxWEB_VIEW_ZOOM_TYPE_TEXT:
+        case wxWEBVIEW_ZOOM_TYPE_TEXT:

             return true;
 
         default:
             return true;
 
         default:


@@ -629,7 +643,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;


@@ -648,7 +662,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


@@ -694,7 +708,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()
                                  ));


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

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

 {
     [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:
             [NSURL URLWithString:wxNSStringWithWxString(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 wxStringWithNSString([m_webView mainFrameTitle]);
 }
 
 {
     return wxStringWithNSString([m_webView mainFrameTitle]);
 }
 

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

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


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

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

 {
     float zoom = GetWebkitZoom();
 
     // arbitrary way to map float zoom to our common zoom enum
     if (zoom <= 0.55)
     {
 {
     float zoom = GetWebkitZoom();
 
     // arbitrary way to map float zoom to our common zoom enum
     if (zoom <= 0.55)
     {

-        return wxWEB_VIEW_ZOOM_TINY;
+        return wxWEBVIEW_ZOOM_TINY;

     }
     else if (zoom > 0.55 && zoom <= 0.85)
     {
     }
     else if (zoom > 0.55 && zoom <= 0.85)
     {

-        return wxWEB_VIEW_ZOOM_SMALL;
+        return wxWEBVIEW_ZOOM_SMALL;

     }
     else if (zoom > 0.85 && zoom <= 1.15)
     {
     }
     else if (zoom > 0.85 && zoom <= 1.15)
     {

-        return wxWEB_VIEW_ZOOM_MEDIUM;
+        return wxWEBVIEW_ZOOM_MEDIUM;

     }
     else if (zoom > 1.15 && zoom <= 1.45)
     {
     }
     else if (zoom > 1.15 && zoom <= 1.45)
     {

-        return wxWEB_VIEW_ZOOM_LARGE;
+        return wxWEBVIEW_ZOOM_LARGE;

     }
     else if (zoom > 1.45)
     {
     }
     else if (zoom > 1.45)
     {

-        return wxWEB_VIEW_ZOOM_LARGEST;
+        return wxWEBVIEW_ZOOM_LARGEST;

     }
 
     // to shut up compilers, this can never be reached logically
     wxASSERT(false);
     }
 
     // to shut up compilers, this can never be reached logically
     wxASSERT(false);

-    return wxWEB_VIEW_ZOOM_MEDIUM;
+    return wxWEBVIEW_ZOOM_MEDIUM;

 }
 
 void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
 }
 
 void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)


@@ -797,23 +811,23 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
     // arbitrary way to map our common zoom enum to float zoom
     switch (zoom)
     {
     // arbitrary way to map our common zoom enum to float zoom
     switch (zoom)
     {

-        case wxWEB_VIEW_ZOOM_TINY:
+        case wxWEBVIEW_ZOOM_TINY:

             SetWebkitZoom(0.4f);
             break;
 
             SetWebkitZoom(0.4f);
             break;
 

-        case wxWEB_VIEW_ZOOM_SMALL:
+        case wxWEBVIEW_ZOOM_SMALL:

             SetWebkitZoom(0.7f);
             break;
 
             SetWebkitZoom(0.7f);
             break;
 

-        case wxWEB_VIEW_ZOOM_MEDIUM:
+        case wxWEBVIEW_ZOOM_MEDIUM:

             SetWebkitZoom(1.0f);
             break;
 
             SetWebkitZoom(1.0f);
             break;
 

-        case wxWEB_VIEW_ZOOM_LARGE:
+        case wxWEBVIEW_ZOOM_LARGE:

             SetWebkitZoom(1.3);
             break;
 
             SetWebkitZoom(1.3);
             break;
 

-        case wxWEB_VIEW_ZOOM_LARGEST:
+        case wxWEBVIEW_ZOOM_LARGEST:

             SetWebkitZoom(1.6);
             break;
 
             SetWebkitZoom(1.6);
             break;
 


@@ -823,7 +837,7 @@ void wxWebViewWebKit::SetZoom(wxWebViewZoom zoom)
 
 }
 
 
 }
 

-void wxWebViewWebKit::SetPage(const wxString& src, const wxString& baseUrl)
+void wxWebViewWebKit::DoSetPage(const wxString& src, const wxString& baseUrl)

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


@@ -865,7 +879,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)


@@ -889,22 +903,22 @@ void wxWebViewWebKit::SelectAll()
     RunScript("window.getSelection().selectAllChildren(document.body);");
 }
 
     RunScript("window.getSelection().selectAllChildren(document.body);");
 }
 

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

 {
     wxString script = ("var range = window.getSelection().getRangeAt(0);"
                        "var element = document.createElement('div');"
                        "element.appendChild(range.cloneContents());"
                        "return element.innerHTML;");
 {
     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]);
+    NSString *result = [m_webView stringByEvaluatingJavaScriptFromString:
+                                  wxNSStringWithWxString(script)];
+    return wxStringWithNSString(result);

 }
 
 }
 

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

 {
 {

-    id result = [[m_webView windowScriptObject]
-                 evaluateWebScript:@"document.body.textContent"];
-    return wxStringWithNSString([result stringValue]);
+    NSString *result = [m_webView stringByEvaluatingJavaScriptFromString:
+                                  @"document.body.textContent"];
+    return wxStringWithNSString(result);

 }
 
 void wxWebViewWebKit::EnableHistory(bool enable)
 }
 
 void wxWebViewWebKit::EnableHistory(bool enable)


@@ -921,9 +935,9 @@ void wxWebViewWebKit::ClearHistory()
     [m_webView setMaintainsBackForwardList:YES];
 }
 
     [m_webView setMaintainsBackForwardList:YES];
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetBackwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > backhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > backhist;

     WebBackForwardList* history = [m_webView backForwardList];
     int count = [history backListCount];
     for(int i = -count; i < 0; i++)
     WebBackForwardList* history = [m_webView backForwardList];
     int count = [history backListCount];
     for(int i = -count; i < 0; i++)


@@ -931,17 +945,17 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetBackwardHistory()
         WebHistoryItem* item = [history itemAtIndex:i];
         wxString url = wxStringWithNSString([item URLString]);
         wxString title = wxStringWithNSString([item title]);
         WebHistoryItem* item = [history itemAtIndex:i];
         wxString url = wxStringWithNSString([item URLString]);
         wxString title = wxStringWithNSString([item title]);

-        wxWebHistoryItem* wxitem = new wxWebHistoryItem(url, title);
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(url, title);

         wxitem->m_histItem = item;
         wxitem->m_histItem = item;

-        wxSharedPtr<wxWebHistoryItem> itemptr(wxitem);
+        wxSharedPtr<wxWebViewHistoryItem> itemptr(wxitem);

         backhist.push_back(itemptr);
     }
     return backhist;
 }
 
         backhist.push_back(itemptr);
     }
     return backhist;
 }
 

-wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
+wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory()

 {
 {

-    wxVector<wxSharedPtr<wxWebHistoryItem> > forwardhist;
+    wxVector<wxSharedPtr<wxWebViewHistoryItem> > forwardhist;

     WebBackForwardList* history = [m_webView backForwardList];
     int count = [history forwardListCount];
     for(int i = 1; i <= count; i++)
     WebBackForwardList* history = [m_webView backForwardList];
     int count = [history forwardListCount];
     for(int i = 1; i <= count; i++)


@@ -949,25 +963,25 @@ wxVector<wxSharedPtr<wxWebHistoryItem> > wxWebViewWebKit::GetForwardHistory()
         WebHistoryItem* item = [history itemAtIndex:i];
         wxString url = wxStringWithNSString([item URLString]);
         wxString title = wxStringWithNSString([item title]);
         WebHistoryItem* item = [history itemAtIndex:i];
         wxString url = wxStringWithNSString([item URLString]);
         wxString title = wxStringWithNSString([item title]);

-        wxWebHistoryItem* wxitem = new wxWebHistoryItem(url, title);
+        wxWebViewHistoryItem* wxitem = new wxWebViewHistoryItem(url, title);

         wxitem->m_histItem = item;
         wxitem->m_histItem = item;

-        wxSharedPtr<wxWebHistoryItem> itemptr(wxitem);
+        wxSharedPtr<wxWebViewHistoryItem> itemptr(wxitem);

         forwardhist.push_back(itemptr);
     }
     return forwardhist;
 }
 
         forwardhist.push_back(itemptr);
     }
     return forwardhist;
 }
 

-void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebHistoryItem> item)
+void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)

 {
     [m_webView goToBackForwardItem:item->m_histItem];
 }
 
 {
     [m_webView goToBackForwardItem:item->m_histItem];
 }
 

-bool wxWebViewWebKit::CanUndo()
+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];
 }


@@ -982,7 +996,7 @@ void wxWebViewWebKit::Redo()
     [[m_webView undoManager] redo];
 }
 
     [[m_webView undoManager] redo];
 }
 

-void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebHandler> handler)
+void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> handler)

 {
     g_stringHandlerMap[handler->GetName()] = handler;
 }
 {
     g_stringHandlerMap[handler->GetName()] = handler;
 }


@@ -1018,13 +1032,13 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebHandler> handler)
     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,
-                                       webKitWindow->GetId(),
-                                       wxStringWithNSString( url ),
-                                       target, false);
+        wxWebViewEvent event(wxEVT_WEBVIEW_NAVIGATED,
+                             webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             target);

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

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

     }
 }
 
     }
 }
 


@@ -1036,19 +1050,19 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebHandler> handler)
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
 
         wxString target = wxStringWithNSString([frame name]);
         NSString *url = [[[[frame dataSource] request] URL] absoluteString];
 
         wxString target = wxStringWithNSString([frame name]);

-        wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_LOADED,
-                                       webKitWindow->GetId(),
-                                       wxStringWithNSString( url ),
-                                       target, false);
+        wxWebViewEvent event(wxEVT_WEBVIEW_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 = wxWEBVIEW_NAV_ERR_OTHER;

 
     if ([[error domain] isEqualToString:NSURLErrorDomain])
     {
 
     if ([[error domain] isEqualToString:NSURLErrorDomain])
     {


@@ -1057,15 +1071,17 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
             case NSURLErrorCannotFindHost:
             case NSURLErrorFileDoesNotExist:
             case NSURLErrorRedirectToNonExistentLocation:
             case NSURLErrorCannotFindHost:
             case NSURLErrorFileDoesNotExist:
             case NSURLErrorRedirectToNonExistentLocation:

-                *out = wxWEB_NAV_ERR_NOT_FOUND;
+                *out = wxWEBVIEW_NAV_ERR_NOT_FOUND;

                 break;
 
             case NSURLErrorResourceUnavailable:
             case NSURLErrorHTTPTooManyRedirects:
                 break;
 
             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:
             case NSURLErrorBadURL:
             case NSURLErrorFileIsDirectory:

-                *out = wxWEB_NAV_ERR_REQUEST;
+                *out = wxWEBVIEW_NAV_ERR_REQUEST;

                 break;
 
             case NSURLErrorTimedOut:
                 break;
 
             case NSURLErrorTimedOut:


@@ -1076,29 +1092,33 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
             //case NSURLErrorInternationalRoamingOff:
             //case NSURLErrorCallIsActive:
             //case NSURLErrorDataNotAllowed:
             //case NSURLErrorInternationalRoamingOff:
             //case NSURLErrorCallIsActive:
             //case NSURLErrorDataNotAllowed:

-                *out = wxWEB_NAV_ERR_CONNECTION;
+                *out = wxWEBVIEW_NAV_ERR_CONNECTION;

                 break;
 
             case NSURLErrorCancelled:
             case NSURLErrorUserCancelledAuthentication:
                 break;
 
             case NSURLErrorCancelled:
             case NSURLErrorUserCancelledAuthentication:

-                *out = wxWEB_NAV_ERR_USER_CANCELLED;
+                *out = wxWEBVIEW_NAV_ERR_USER_CANCELLED;

                 break;
 
                 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:

-                *out = wxWEB_NAV_ERR_REQUEST;
+#endif
+            case NSURLErrorBadServerResponse:
+                *out = wxWEBVIEW_NAV_ERR_REQUEST;

                 break;
 
             case NSURLErrorUserAuthenticationRequired:
             case NSURLErrorSecureConnectionFailed:
                 break;
 
             case NSURLErrorUserAuthenticationRequired:
             case NSURLErrorSecureConnectionFailed:

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6

             case NSURLErrorClientCertificateRequired:
             case NSURLErrorClientCertificateRequired:

-                *out = wxWEB_NAV_ERR_AUTH;
+#endif
+                *out = wxWEBVIEW_NAV_ERR_AUTH;

                 break;
 
             case NSURLErrorNoPermissionsToReadFile:
                 break;
 
             case NSURLErrorNoPermissionsToReadFile:

-                               *out = wxWEB_NAV_ERR_SECURITY;
+                               *out = wxWEBVIEW_NAV_ERR_SECURITY;

                 break;
 
             case NSURLErrorServerCertificateHasBadDate:
                 break;
 
             case NSURLErrorServerCertificateHasBadDate:


@@ -1106,7 +1126,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
             case NSURLErrorServerCertificateHasUnknownRoot:
             case NSURLErrorServerCertificateNotYetValid:
             case NSURLErrorClientCertificateRejected:
             case NSURLErrorServerCertificateHasUnknownRoot:
             case NSURLErrorServerCertificateNotYetValid:
             case NSURLErrorClientCertificateRejected:

-                *out = wxWEB_NAV_ERR_CERTIFICATE;
+                *out = wxWEBVIEW_NAV_ERR_CERTIFICATE;

                 break;
         }
     }
                 break;
         }
     }


@@ -1128,18 +1148,18 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
     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,
-                                              webKitWindow->GetId(),
-                                       wxStringWithNSString( url ),
-                                       wxEmptyString, false);
-               thisEvent.SetString(description);
-               thisEvent.SetInt(type);
+               wxWebViewEvent event(wxEVT_WEBVIEW_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);

                }
     }
 }
                }
     }
 }


@@ -1154,17 +1174,17 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
         NSString *url = [[[[frame provisionalDataSource] request] URL]
                             absoluteString];
 
         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,
-                                              webKitWindow->GetId(),
-                                       wxStringWithNSString( url ),
-                                       wxEmptyString, false);
-               thisEvent.SetString(description);
-               thisEvent.SetInt(type);
+               wxWebViewEvent event(wxEVT_WEBVIEW_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);

     }
 }
 
     }
 }
 


@@ -1172,15 +1192,15 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
                                          forFrame:(WebFrame *)frame
 {
     wxString target = wxStringWithNSString([frame name]);
                                          forFrame:(WebFrame *)frame
 {
     wxString target = wxStringWithNSString([frame name]);

-    wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
-                                   webKitWindow->GetId(),
-                                   webKitWindow->GetCurrentURL(),
-                                   target, true);
-                                   
-    thisEvent.SetString(wxStringWithNSString(title));
+    wxWebViewEvent event(wxEVT_WEBVIEW_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
 


@@ -1204,14 +1224,14 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
     webKitWindow->m_busy = true;
     NSString *url = [[request URL] absoluteString];
     wxString target = wxStringWithNSString([frame name]);
     webKitWindow->m_busy = true;
     NSString *url = [[request URL] absoluteString];
     wxString target = wxStringWithNSString([frame name]);

-    wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
-                                   webKitWindow->GetId(),
-                                   wxStringWithNSString( url ), target, true);
+    wxWebViewEvent event(wxEVT_WEBVIEW_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())

     {
         webKitWindow->m_busy = false;
         [listener ignore];
     {
         webKitWindow->m_busy = false;
         [listener ignore];


@@ -1222,7 +1242,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
     }
 }
 
     }
 }
 

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

       decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
                              request:(NSURLRequest *)request
                         newFrameName:(NSString *)frameName
       decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
                              request:(NSURLRequest *)request
                         newFrameName:(NSString *)frameName


@@ -1231,12 +1251,12 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
     wxUnusedVar(actionInformation);
 
     NSString *url = [[request URL] absoluteString];
     wxUnusedVar(actionInformation);
 
     NSString *url = [[request URL] absoluteString];

-    wxWebNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
-                                   webKitWindow->GetId(),
-                                   wxStringWithNSString( url ), "", true);
+    wxWebViewEvent event(wxEVT_WEBVIEW_NEWWINDOW,
+                         webKitWindow->GetId(),
+                         wxStringWithNSString( url ), "");

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

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

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


@@ -1262,7 +1282,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
 
 + (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request
 {
 
 + (NSURLRequest *)canonicalRequestForRequest:(NSURLRequest *)request
 {

-    //We don't do any processing here as the wxWebHandler classes do it
+    //We don't do any processing here as the wxWebViewHandler classes do it

     return request;
 }
 
     return request;
 }
 


@@ -1271,26 +1291,38 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
     NSURLRequest *request = [self request];
        NSString* path = [[request URL] absoluteString];
 
     NSURLRequest *request = [self request];
        NSString* path = [[request URL] absoluteString];
 

+    id<NSURLProtocolClient> client = [self client];
+

     wxString wxpath = wxStringWithNSString(path);
     wxString scheme = wxStringWithNSString([[request URL] scheme]);
     wxFSFile* file = g_stringHandlerMap[scheme]->GetFile(wxpath);
     wxString wxpath = wxStringWithNSString(path);
     wxString scheme = wxStringWithNSString([[request URL] scheme]);
     wxFSFile* file = g_stringHandlerMap[scheme]->GetFile(wxpath);

+
+    if (!file)
+    {
+        NSError *error = [[NSError alloc] initWithDomain:NSURLErrorDomain
+                            code:NSURLErrorFileDoesNotExist
+                            userInfo:nil];
+
+        [client URLProtocol:self didFailWithError:error];
+
+        return;
+    }
+

     size_t length = file->GetStream()->GetLength();
 
 
     NSURLResponse *response =  [[NSURLResponse alloc] initWithURL:[request URL]
                                           MIMEType:wxNSStringWithWxString(file->GetMimeType())
     size_t length = file->GetStream()->GetLength();
 
 
     NSURLResponse *response =  [[NSURLResponse alloc] initWithURL:[request URL]
                                           MIMEType:wxNSStringWithWxString(file->GetMimeType())

-                                          expectedContentLength:length 
+                                          expectedContentLength:length

                                           textEncodingName:nil];
                                           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];
     //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
 
     //We do not support caching anything yet

-       [client URLProtocol:self didReceiveResponse:response 
+       [client URLProtocol:self didReceiveResponse:response

             cacheStoragePolicy:NSURLCacheStorageNotAllowed];
 
     //Set the data
             cacheStoragePolicy:NSURLCacheStorageNotAllowed];
 
     //Set the data


@@ -1309,4 +1341,32 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebNavigationError* out)
 
 @end
 
 
 @end
 

-#endif //wxUSE_WEBVIEW_WEBKIT
+
+@implementation WebViewUIDelegate
+
+- initWithWxWindow: (wxWebViewWebKit*)inWindow
+{
+    [super init];
+    webKitWindow = inWindow;    // non retained
+    return self;
+}
+
+- (void)webView:(WebView *)sender printFrameView:(WebFrameView *)frameView
+{
+    wxUnusedVar(sender);
+    wxUnusedVar(frameView);
+
+    webKitWindow->Print();
+}
+
+- (NSArray *)webView:(WebView *)sender contextMenuItemsForElement:(NSDictionary *)element
+                                                 defaultMenuItems:(NSArray *) defaultMenuItems
+{
+    if(webKitWindow->IsContextMenuEnabled())
+        return defaultMenuItems;
+    else
+        return nil;
+}
+@end
+
+#endif //wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT