Several wxWebKitCtrl enhancements/fixes. Including:

- new methods for increasing/decreasing text size, getting selection, getting/setting scroll position, printing, enabling editing, and running JavaScripts on the page.

- added new event (wxWebKitBeforeLoadEvent) for catching, and possibly vetoing, load events before they occur.

- wxWebKitCtrl now fires mouse events for certain events that it was eating before. This improves wxSplitterWindow resizing behavior.

- refactoring of the sizing logic to move the Cocoa view. I've tested this with splitter windows, panels, notebooks and all position correctly with this.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/html/webkit.h

@@ -18,9 +18,6 @@
 #error "wxWebKitCtrl not implemented for this platform"
 #endif
 
-#ifdef __WXCOCOA
-#include <WebKit/WebKit.h>
-#endif
 #include "wx/control.h"
 
 // ----------------------------------------------------------------------------
@@ -62,12 +59,36 @@ public:
     void Stop();
     bool CanGetPageSource();
     wxString GetPageSource();
-    void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString);
+    void SetPageSource(const wxString& source, const wxString& baseUrl = wxEmptyString);
-    wxString GetPageURL(){ return m_currentURL; }
+	wxString GetPageURL(){ return m_currentURL; }
-    wxString GetPageTitle(){ return m_pageTitle; }
+    void SetPageTitle(const wxString& title) { m_pageTitle = title; }
+	wxString GetPageTitle(){ return m_pageTitle; }
+    
+    // since these worked in 2.6, add wrappers
+    void SetTitle(const wxString& title) { SetPageTitle(title); }
+    wxString GetTitle() { return GetPageTitle(); }
+    
+    wxString GetSelection();
+    
+    bool CanIncreaseTextSize();
+    void IncreaseTextSize();
+    bool CanDecreaseTextSize();
+    void DecreaseTextSize();
+    
+    void Print(bool showPrompt=FALSE);
+    
+    void MakeEditable(bool enable=TRUE);
+    bool IsEditable();
+    
+    wxString RunScript(const wxString& javascript);
+    
+    void SetScrollPos(int pos);
+    int GetScrollPos();
 
     //we need to resize the webview when the control size changes
     void OnSize(wxSizeEvent &event);
+    void OnMove(wxMoveEvent &event);
+    void OnMouseEvents(wxMouseEvent &event);
 protected:
     DECLARE_EVENT_TABLE()
     void MacVisibilityChanged();
@@ -77,7 +98,12 @@ private:
     wxWindowID m_windowID;
     wxString m_currentURL;
     wxString m_pageTitle;
+    
     struct objc_object *m_webView;
+    
+    // we may use this later to setup our own mouse events,
+    // so leave it in for now.
+    void* m_webKitCtrlEventHandler;
     //It should be WebView*, but WebView is an Objective-C class
     //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
 };
@@ -95,6 +121,39 @@ enum {
         wxWEBKIT_STATE_FAILED = 32
 };
 
+enum {
+    wxWEBKIT_NAV_LINK_CLICKED = 1,
+    wxWEBKIT_NAV_BACK_NEXT = 2,
+    wxWEBKIT_NAV_FORM_SUBMITTED = 4,
+    wxWEBKIT_NAV_RELOAD = 8,
+    wxWEBKIT_NAV_FORM_RESUBMITTED = 16,
+    wxWEBKIT_NAV_OTHER = 32
+
+};
+
+
+
+class wxWebKitBeforeLoadEvent : public wxCommandEvent
+{
+    DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent )
+    
+public:
+    bool IsCancelled() { return m_cancelled; }
+    void Cancel(bool cancel = true) { m_cancelled = cancel; }
+    wxString GetURL() { return m_url; }
+    void SetURL(const wxString& url) { m_url = url; }
+    void SetNavigationType(int navType) { m_navType = navType; }
+    int GetNavigationType() { return m_navType; }
+
+    wxWebKitBeforeLoadEvent( wxWindow* win = (wxWindow*) NULL );
+    wxEvent *Clone(void) const { return new wxWebKitBeforeLoadEvent(*this); }
+
+protected:
+    bool m_cancelled;
+    wxString m_url;
+    int m_navType;
+};
+
 class wxWebKitStateChangedEvent : public wxCommandEvent
 {
     DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent )
@@ -114,8 +173,10 @@ protected:
 };
 
 typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&);
+typedef void (wxEvtHandler::*wxWebKitBeforeLoadEventFunction)(wxWebKitBeforeLoadEvent&);
 
 BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_BEFORE_LOAD, wxID_ANY)
     DECLARE_LOCAL_EVENT_TYPE(wxEVT_WEBKIT_STATE_CHANGED, wxID_ANY)
 END_DECLARE_EVENT_TYPES()
 
@@ -126,6 +187,14 @@ END_DECLARE_EVENT_TYPES()
                             (wxObjectEventFunction)   \
                             (wxWebKitStateChangedEventFunction) & func, \
                             (wxObject *) NULL ),
+                            
+#define EVT_WEBKIT_BEFORE_LOAD(func) \
+            DECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \
+                            wxID_ANY, \
+                            wxID_ANY, \
+                            (wxObjectEventFunction)   \
+                            (wxWebKitBeforeLoadEventFunction) & func, \
+                            (wxObject *) NULL ),
 
 #endif // wxUSE_WEBKIT
 

src/html/htmlctrl/webkit/webkit.mm

@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "webkit.h"
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #include "wx/splitter.h"
@@ -30,8 +34,8 @@
 #endif
 
 #include "wx/html/webkit.h"
-#include "wx/notebook.h"
 
+#define DEBUG_WEBKIT_SIZING 0
 
 // ----------------------------------------------------------------------------
 // macros
@@ -43,6 +47,87 @@ BEGIN_EVENT_TABLE(wxWebKitCtrl, wxControl)
     EVT_SIZE(wxWebKitCtrl::OnSize)
 END_EVENT_TABLE()
 
+// ----------------------------------------------------------------------------
+// Carbon Events handlers
+// ----------------------------------------------------------------------------
+
+// prototype for function in src/mac/carbon/toplevel.cpp
+void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent );
+
+static const EventTypeSpec eventList[] =
+{
+    //{ kEventClassControl, kEventControlTrack } ,
+    { kEventClassMouse, kEventMouseUp },
+    { kEventClassMouse, kEventMouseDown },
+    { kEventClassMouse, kEventMouseMoved },
+    { kEventClassMouse, kEventMouseDragged },
+#if DEBUG_WEBKIT_SIZING == 1
+    { kEventClassControl, kEventControlBoundsChanged } ,
+#endif
+};
+
+static pascal OSStatus wxWebKitCtrlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+    OSStatus result = eventNotHandledErr ;
+
+    wxMacCarbonEvent cEvent( event ) ;
+
+    ControlRef controlRef ;
+    wxWebKitCtrl* thisWindow = (wxWebKitCtrl*) data ;
+    wxTopLevelWindowMac* tlw = NULL;
+    if (thisWindow)
+        tlw = thisWindow->MacGetTopLevelWindow();
+
+    cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+    
+    wxWindow* currentMouseWindow = thisWindow ;
+    
+    if ( wxApp::s_captureWindow )
+        currentMouseWindow = wxApp::s_captureWindow;
+
+    switch ( GetEventKind( event ) )
+    {
+        case kEventMouseDragged :
+        case kEventMouseMoved :
+            {
+                wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
+                SetupMouseEvent( wxevent , cEvent ) ;
+                
+                currentMouseWindow->ScreenToClient( &wxevent.m_x , &wxevent.m_y ) ;
+                wxevent.SetEventObject( currentMouseWindow ) ;
+                wxevent.SetId( currentMouseWindow->GetId() ) ;
+                
+                if ( currentMouseWindow->GetEventHandler()->ProcessEvent(wxevent) )
+                {
+                    result = noErr;
+                }
+
+                break; // this should enable WebKit to fire mouse dragged and mouse up events...
+            }
+
+        case kEventControlBoundsChanged:
+            {
+                // this is just here for debugging, so we can note any differences between
+                // native event sizes and the sizes the wxWindow receives.
+                Rect origBounds = cEvent.GetParameter<Rect>(kEventParamOriginalBounds, typeQDRectangle) ;
+                Rect prevBounds = cEvent.GetParameter<Rect>(kEventParamPreviousBounds, typeQDRectangle) ;
+                Rect curBounds = cEvent.GetParameter<Rect>(kEventParamCurrentBounds, typeQDRectangle) ;
+                    
+                fprintf(stderr, "Orig bounds x=%d, y=%d, height=%d, width=%d\n", origBounds.left, origBounds.top, origBounds.bottom -origBounds.top, origBounds.right - origBounds.left);
+                fprintf(stderr, "Prev bounds x=%d, y=%d, height=%d, width=%d\n", prevBounds.left, prevBounds.top, prevBounds.bottom -prevBounds.top, prevBounds.right - prevBounds.left);
+                fprintf(stderr, "Cur bounds x=%d, y=%d, height=%d, width=%d\n", curBounds.left, curBounds.top, curBounds.bottom -curBounds.top, curBounds.right - curBounds.left);
+            }
+        default :
+            break ;
+    }
+
+    result = CallNextEventHandler(handler, event);
+    return result ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxWebKitCtrlEventHandler )
+
+
 // ----------------------------------------------------------------------------
 // wxWebKit Events
 // ----------------------------------------------------------------------------
@@ -58,6 +143,18 @@ wxWebKitStateChangedEvent::wxWebKitStateChangedEvent( wxWindow* win )
     SetId(win->GetId());
 }
 
+IMPLEMENT_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent, wxCommandEvent )
+
+DEFINE_EVENT_TYPE( wxEVT_WEBKIT_BEFORE_LOAD )
+
+wxWebKitBeforeLoadEvent::wxWebKitBeforeLoadEvent( wxWindow* win )
+{
+    m_cancelled = false;
+    SetEventType( wxEVT_WEBKIT_BEFORE_LOAD);
+    SetEventObject( win );
+    SetId(win->GetId());
+}
+
 //---------------------------------------------------------
 // helper functions for NSString<->wxString conversion
 //---------------------------------------------------------
@@ -80,12 +177,40 @@ inline NSString* wxNSStringWithWxString(const wxString &wxstring)
 #endif // wxUSE_UNICODE
 }
 
-@interface MyFrameLoadMonitor : NSObject
+inline int wxNavTypeFromWebNavType(int type){
-{
+    if (type == WebNavigationTypeLinkClicked)
-    wxWindow* webKitWindow;
+        return wxWEBKIT_NAV_LINK_CLICKED;
+    
+    if (type == WebNavigationTypeFormSubmitted)
+        return wxWEBKIT_NAV_FORM_SUBMITTED;
+        
+    if (type == WebNavigationTypeBackForward)
+        return wxWEBKIT_NAV_BACK_NEXT;
+        
+    if (type == WebNavigationTypeReload)
+        return wxWEBKIT_NAV_RELOAD;
+        
+    if (type == WebNavigationTypeFormResubmitted)
+        return wxWEBKIT_NAV_FORM_RESUBMITTED;
+        
+    return wxWEBKIT_NAV_OTHER;
 }
 
-- initWithWxWindow: (wxWindow*)inWindow;
+@interface MyFrameLoadMonitor : NSObject
+{
+    wxWebKitCtrl* webKitWindow;
+}
+
+- initWithWxWindow: (wxWebKitCtrl*)inWindow;
+
+@end
+
+@interface MyPolicyDelegate : NSObject
+{
+    wxWebKitCtrl* webKitWindow;
+}
+
+- initWithWxWindow: (wxWebKitCtrl*)inWindow;
 
 @end
 
@@ -147,19 +272,28 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
     HIWebViewCreate( m_peer->GetControlRefAddr() );
 
     m_webView = (WebView*) HIWebViewGetWebView( m_peer->GetControlRef() );
+    
     MacPostControlCreate(pos, size);
     HIViewSetVisible( m_peer->GetControlRef(), true );
     [m_webView setHidden:false];
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
     if ( UMAGetSystemVersion() >= 0x1030 )
-    HIViewChangeFeatures( m_peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
+        HIViewChangeFeatures( m_peer->GetControlRef() , kHIViewIsOpaque , 0 ) ;
 #endif
+    InstallControlEventHandler( m_peer->GetControlRef() , GetwxWebKitCtrlEventHandlerUPP(),
+        GetEventTypeCount(eventList), eventList, this,
+        (EventHandlerRef *)&m_webKitCtrlEventHandler);
+
 #endif
 
     // Register event listener interfaces
-    MyFrameLoadMonitor* myFrameLoadMonitor = [[MyFrameLoadMonitor alloc] initWithWxWindow: (wxWindow*)this];
+    MyFrameLoadMonitor* myFrameLoadMonitor = [[MyFrameLoadMonitor alloc] initWithWxWindow: this];
     [m_webView setFrameLoadDelegate:myFrameLoadMonitor];
-
+    
+    // this is used to veto page loads, etc.
+    MyPolicyDelegate* myPolicyDelegate = [[MyPolicyDelegate alloc] initWithWxWindow: this];
+    [m_webView setPolicyDelegate:myPolicyDelegate];
+    
     LoadURL(m_currentURL);
     return true;
 }
@@ -245,11 +379,128 @@ wxString wxWebKitCtrl::GetPageSource(){
     return wxEmptyString;
 }
 
-void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
+wxString wxWebKitCtrl::GetSelection(){
+    if ( !m_webView )
+        return wxEmptyString;
+        
+    NSString* selectedText = [[m_webView selectedDOMRange] toString];
+    return wxStringWithNSString( selectedText );
+}
+
+bool wxWebKitCtrl::CanIncreaseTextSize(){
+    if ( !m_webView )
+        return false;
+        
+    if ([m_webView canMakeTextLarger])
+        return true;
+    else
+        return false;
+}
+
+void wxWebKitCtrl::IncreaseTextSize(){
+    if ( !m_webView )
+        return;
+        
+    if (CanIncreaseTextSize())
+        [m_webView makeTextLarger:(WebView*)m_webView];
+}
+
+bool wxWebKitCtrl::CanDecreaseTextSize(){
+    if ( !m_webView )
+        return false;
+        
+    if ([m_webView canMakeTextSmaller])
+        return true;
+    else
+        return false;
+}
+
+void wxWebKitCtrl::DecreaseTextSize(){
+    if ( !m_webView )
+        return;
+        
+    if (CanDecreaseTextSize())
+        [m_webView makeTextSmaller:(WebView*)m_webView];
+}
+
+void wxWebKitCtrl::SetPageSource(const wxString& source, const wxString& baseUrl){
     if ( !m_webView )
         return;
 
     [[m_webView mainFrame] loadHTMLString:(NSString*)wxNSStringWithWxString( source ) baseURL:[NSURL URLWithString:wxNSStringWithWxString( baseUrl )]];
+
+}
+
+void wxWebKitCtrl::Print(bool showPrompt){
+    if ( !m_webView )
+        return;
+    
+    id view = [[[m_webView mainFrame] frameView] documentView]; 
+    NSPrintOperation *op = [NSPrintOperation printOperationWithView:view printInfo: [NSPrintInfo sharedPrintInfo]]; 
+    if (showPrompt){
+        [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 workaround for the bug.
+        [op setShowsProgressPanel: false];
+    }
+    // Print it. 
+    [op runOperation]; 
+}
+
+void wxWebKitCtrl::MakeEditable(bool enable){
+    if ( !m_webView )
+        return;
+
+    [m_webView setEditable:enable ];
+}
+
+bool wxWebKitCtrl::IsEditable(){
+    if ( !m_webView )
+        return false;
+
+    return [m_webView isEditable];
+}
+
+int wxWebKitCtrl::GetScrollPos(){
+    id result = [[m_webView windowScriptObject] evaluateWebScript:@"document.body.scrollTop"];
+    return [result intValue];
+}   
+
+void wxWebKitCtrl::SetScrollPos(int pos){
+    if ( !m_webView )
+        return;
+        
+    wxString javascript; 
+    javascript.Printf(wxT("document.body.scrollTop = %d;"), pos);
+    [[m_webView windowScriptObject] evaluateWebScript:(NSString*)wxNSStringWithWxString( javascript )];
+}
+
+wxString wxWebKitCtrl::RunScript(const wxString& javascript){
+    if ( !m_webView )
+        return wxEmptyString;    
+        
+    id result = [[m_webView windowScriptObject] evaluateWebScript:(NSString*)wxNSStringWithWxString( javascript )];
+    
+    NSString* resultAsString;
+    wxString resultAsWxString = wxEmptyString;
+    NSString* className = NSStringFromClass([result class]);
+    if ([className isEqualToString:@"NSCFNumber"])
+        resultAsString = [NSString stringWithFormat:@"%@", result];
+    else if ([className isEqualToString:@"NSCFString"])
+        resultAsString = result;
+    else if ([className isEqualToString:@"NSCFBoolean"]){
+        if ([result boolValue])
+            resultAsString = @"true";
+        else
+            resultAsString = @"false";
+    }
+    else if ([className isEqualToString:@"WebScriptObject"])
+        resultAsString = [result stringRepresentation];
+    else
+        fprintf(stderr, "wxWebKitCtrl::RunScript - Unexpected return type: %s!\n", [className UTF8String]);
+
+    resultAsWxString = wxStringWithNSString( resultAsString );
+    return resultAsWxString;
 }
 
 void wxWebKitCtrl::OnSize(wxSizeEvent &event){
@@ -261,126 +512,61 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
     // I also left some test debugging print statements as a convenience if a(nother)
     // problem crops up.
 
-    // Let's hope that Tiger fixes this mess...
-
-    int x, y;
-    x = 0;
-    y = 0;
-
-    wxWindow* parent = GetParent();
-
     wxWindow* tlw = MacGetTopLevelWindow();
 
+    NSRect frame = [m_webView frame];
+    NSRect bounds = [m_webView bounds];
+    
+#if DEBUG_WEBKIT_SIZING
+    fprintf(stderr,"Carbon window x=%d, y=%d, width=%d, height=%d\n", GetPosition().x, GetPosition().y, GetSize().x, GetSize().y);
+    fprintf(stderr, "Cocoa window frame x=%G, y=%G, width=%G, height=%G\n", frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
+    fprintf(stderr, "Cocoa window bounds x=%G, y=%G, width=%G, height=%G\n", bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
+#endif
+
     // This must be the case that Apple tested with, because well, in this one case
     // we don't need to do anything! It just works. ;)
-    if (parent == tlw){
+    if (GetParent() == tlw){
         return;
     }
 
-    while(parent != NULL)
+    int x = GetPosition().x; 
-    {
+    int y = GetPosition().y;
-        if ( parent->IsKindOf( CLASSINFO( wxSplitterWindow ) ) && GetParent()->IsKindOf( CLASSINFO( wxSplitterWindow ) ) ){
+    
-                // When parent is not a wxSplitterWindow, we can rely on it's GetPosition() to give us the correct
+    HIRect rect;
-                // coordinates, but when the parent is a wxSplitterWindow, we need to manually calculate
+    rect.origin.x = x;
-                // the sash position of it and any parent wxSplitterWindows into the webkit's position.
+    rect.origin.y = y;
-                wxSplitterWindow* splitter;
-                splitter = dynamic_cast<wxSplitterWindow*>(parent);
-                if (splitter->GetSplitMode() == wxSPLIT_HORIZONTAL){
-                    if (splitter->GetPosition().y > 0)
-                        y += splitter->GetPosition().y;
 
-                    if (splitter->GetSashSize() > 0)
+#if DEBUG_WEBKIT_SIZING
-                        y += splitter->GetSashSize();
+    printf("Before conversion, origin is: x = %d, y = %d\n", x, y);
+#endif
 
-                    if (splitter->GetSashPosition() > 0)
+    // NB: In most cases, when calling HIViewConvertRect, what people want is to use GetRootControl(),
-                        y += splitter->GetSashPosition();
+    // and this tripped me up at first. But in fact, what 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 
-                else{
+    // the y coordinate for Cocoa. 
-                    if (splitter->GetPosition().x > 0)
+    HIViewConvertRect (&rect, HIViewGetSuperview( m_peer->GetControlRef() ), 
-                        x += splitter->GetPosition().x;
+                                HIViewGetRoot( (WindowRef) MacGetTopLevelWindowRef() ) );
 
-                    if (splitter->GetSashSize() > 0)
+    x = (int)rect.origin.x;
-                        x += splitter->GetSashSize();
+    y = (int)rect.origin.y;
 
-                    if (splitter->GetSashPosition() > 0)
+#if DEBUG_WEBKIT_SIZING
-                        x += splitter->GetSashPosition();
+    printf("Moving Cocoa frame origin to: x = %d, y = %d\n", x, y);
-                }
+#endif
-        }
-        else{
-            if (!parent->IsTopLevel()) {
-                //printf("Parent: %s\n", parent->GetClassInfo()->GetClassName());
-                int plusx = 0;
-                plusx = parent->GetClientAreaOrigin().x + parent->GetPosition().x;
-                if (plusx > 0){
-                    x += plusx;
-                    //printf("Parent: %s Added x: %d\n", parent->GetClassInfo()->GetClassName(), parent->GetClientAreaOrigin().x + parent->GetPosition().x);
-                }
-
-                int plusy = 0;
-                plusy = parent->GetClientAreaOrigin().y + parent->GetPosition().y;
-                if (plusy > 0){
-                    y += plusy;
-                    //printf("Parent: %s Added y: %d\n", parent->GetClassInfo()->GetClassName(), parent->GetClientAreaOrigin().y + parent->GetPosition().y);
-                }
-                else{
-                    //printf("Parent: %s Origin: %d Position:%d\n", parent->GetClassInfo()->GetClassName(), parent->GetClientAreaOrigin().y, parent->GetPosition().y);
-                }
-
-            }
-            else{
-                //
-                x += parent->GetClientAreaOrigin().x;
-                // calculate the title bar height (26 pixels) into the top offset.
-                // This becomes important later when we must flip the y coordinate
-                // to convert to Cocoa's coordinate system.
-                y += parent->GetClientAreaOrigin().y += 26;
-                //printf("x: %d, y:%d\n", x, y);
-            }
-            //we still need to add the y, because we have to convert/flip coordinates for Cocoa
-
-            if ( parent->IsKindOf( CLASSINFO( wxNotebook ) )  ){
-                //Not sure why calcs are off in this one scenario...
-                y -= 4;
-                //printf("x: %d, y:%d\n", x, y);
-            }
-
-            if (parent->IsKindOf( CLASSINFO( wxPanel ) ) ){
-                // Another strange case. Adding a wxPanel to the parent heirarchy
-                // causes wxWebKitCtrl's Cocoa y origin to be 4 pixels off
-                // for some reason, even if the panel has a position and origin of 0.
-                // This corrects that. Man, I wish I could debug Carbon/HIWebView!! ;)
-                y -= 4;
-            }
-        }
-
-        parent = parent->GetParent();
-    }
-
-    // Tried using MacWindowToRootWindow both for wxWebKitCtrl and its parent,
-    // but coordinates were off by a significant amount.
-    // Am leaving the code here if anyone wants to play with it.
-
-    //int x2, y2 = 0;
-    //if (GetParent())
-    //    GetParent()->MacWindowToRootWindow(&x2, &y2);
-    //printf("x = %d, y = %d\n", x, y);
-    //printf("x2 = %d, y2 = %d\n", x2, y2);
-    //x = x2;
-    //y = y2;
 
     if (tlw){
         //flip the y coordinate to convert to Cocoa coordinates
-        //printf("tlw y: %d, y: %d\n", tlw->GetSize().y, (GetSize().y + y));
         y = tlw->GetSize().y - ((GetSize().y) + y);
     }
 
-    //printf("Added to bounds x=%d, y=%d\n", x, y);
+#if DEBUG_WEBKIT_SIZING
-    NSRect bounds = [m_webView frame];
+    printf("y = %d after flipping value\n", y);
-    bounds.origin.x = x;
+#endif
-    bounds.origin.y = y;
-    [m_webView setFrame:bounds];
 
-    //printf("Carbon position x=%d, y=%d\n", GetPosition().x, GetPosition().y);
+    frame.origin.x = x;
+    frame.origin.y = y;
+    [m_webView setFrame:frame];
+   
     if (IsShown())
         [(WebView*)m_webView display];
     event.Skip();
@@ -400,7 +586,7 @@ void wxWebKitCtrl::MacVisibilityChanged(){
 
 @implementation MyFrameLoadMonitor
 
-- initWithWxWindow: (wxWindow*)inWindow
+- initWithWxWindow: (wxWebKitCtrl*)inWindow
 {
     [super init];
     webKitWindow = inWindow;    // non retained
@@ -465,9 +651,40 @@ void wxWebKitCtrl::MacVisibilityChanged(){
 - (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame
 {
     if (frame == [sender mainFrame]){
-        webKitWindow->SetLabel(wxStringWithNSString( title ));
+        webKitWindow->SetPageTitle(wxStringWithNSString( title ));
     }
 }
 @end
 
+@implementation MyPolicyDelegate
+
+- initWithWxWindow: (wxWebKitCtrl*)inWindow
+{
+    [super init];
+    webKitWindow = inWindow;    // non retained
+    return self;
+}
+
+- (void)webView:(WebView *)sender decidePolicyForNavigationAction:(NSDictionary *)actionInformation request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener
+{
+    wxWebKitBeforeLoadEvent thisEvent(webKitWindow);
+
+    // Get the navigation type. 
+    NSNumber *n = [actionInformation objectForKey:WebActionNavigationTypeKey]; 
+    int actionType = [n intValue];
+    thisEvent.SetNavigationType( wxNavTypeFromWebNavType(actionType) );
+    
+    NSString *url = [[request URL] absoluteString];
+    thisEvent.SetURL( wxStringWithNSString( url ) );
+    
+    webKitWindow->GetEventHandler()->ProcessEvent(thisEvent);
+
+	if (thisEvent.IsCancelled())
+        [listener ignore];
+    else
+        [listener use];
+}
+
+@end
+
 #endif //wxUSE_WEBKIT

wxPython/src/webkit.i

@@ -86,6 +86,24 @@ public:
     void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString) {}
     wxString GetPageURL()   { return wxEmptyString; }
     wxString GetPageTitle() { return wxEmptyString; }
+    
+    wxString GetSelection() { return wxEmptyString; }
+    
+    bool CanIncreaseTextSize() { return false; }
+    void IncreaseTextSize() { }
+    bool CanDecreaseTextSize() { return false; }
+    void DecreaseTextSize() { }
+    
+    void Print(bool showPrompt=false) { }
+    
+    void MakeEditable(bool enable=true) { }
+    bool IsEditable() { return false; }
+    
+    wxString RunScript(const wxString& javascript) { return wxEmptyString; }
+    
+    void SetScrollPos(int pos) { }
+    int GetScrollPos() { return 0; }
+    
 };
 
 
@@ -100,6 +118,16 @@ enum {
     wxEVT_WEBKIT_STATE_CHANGED = 0
 };
 
+enum {
+    wxWEBKIT_NAV_LINK_CLICKED = 0,
+    wxWEBKIT_NAV_BACK_NEXT = 0,
+    wxWEBKIT_NAV_FORM_SUBMITTED = 0,
+    wxWEBKIT_NAV_RELOAD = 0,
+    wxWEBKIT_NAV_FORM_RESUBMITTED = 0,
+    wxWEBKIT_NAV_OTHER = 0
+
+};
+
 class wxWebKitStateChangedEvent : public wxCommandEvent
 {
 public:
@@ -112,6 +140,18 @@ public:
     void SetURL(const wxString& url) {}
 };
 
+class wxWebKitBeforeLoadEvent : public wxCommandEvent
+{    
+public:
+    bool IsCancelled() { return false; }
+    void Cancel(bool cancel = true) { }
+    wxString GetURL() { return wxEmptyString; }
+    void SetURL(const wxString& url) { }
+    void SetNavigationType(int navType) { }
+    int GetNavigationType() { return 0; }
+
+    wxWebKitBeforeLoadEvent( wxWindow* win = (wxWindow*) NULL ) { wxPyRaiseNotImplemented }
+};
  
 #endif
 %}
@@ -159,9 +199,29 @@ public:
     wxString GetPageURL();
     wxString GetPageTitle();
 
+    wxString GetSelection();
+    
+    bool CanIncreaseTextSize();
+    void IncreaseTextSize();
+    bool CanDecreaseTextSize();
+    void DecreaseTextSize();
+    
+    void Print(bool showPrompt=false);
+    
+    void MakeEditable(bool enable=true);
+    bool IsEditable();
+    
+    wxString RunScript(const wxString& javascript);
+    
+    void SetScrollPos(int pos);
+    int GetScrollPos();
+    
+    
     %property(PageSource, GetPageSource, SetPageSource, doc="See `GetPageSource` and `SetPageSource`");
     %property(PageTitle, GetPageTitle, doc="See `GetPageTitle`");
     %property(PageURL, GetPageURL, doc="See `GetPageURL`");    
+    %property(ScrollPos, GetScrollPos, SetScrollPos, doc="See `GetScrollPos and SetScrollPos`");
+    %property(Selection, GetSelection, doc="See `GetSelection`");
 };
 
 
@@ -177,8 +237,34 @@ enum {
     wxWEBKIT_STATE_FAILED,
 };
 
+enum {
+    wxWEBKIT_NAV_LINK_CLICKED,
+    wxWEBKIT_NAV_BACK_NEXT,
+    wxWEBKIT_NAV_FORM_SUBMITTED,
+    wxWEBKIT_NAV_RELOAD,
+    wxWEBKIT_NAV_FORM_RESUBMITTED,
+    wxWEBKIT_NAV_OTHER
+
+};
 
 %constant wxEventType wxEVT_WEBKIT_STATE_CHANGED;
+%constant wxEventType wxEVT_WEBKIT_BEFORE_LOAD;
+
+class wxWebKitBeforeLoadEvent : public wxCommandEvent
+{    
+public:
+    bool IsCancelled();
+    void Cancel(bool cancel = true);
+    wxString GetURL();
+    void SetURL(const wxString& url);
+    void SetNavigationType(int navType);
+    int GetNavigationType();
+
+    wxWebKitBeforeLoadEvent( wxWindow* win = (wxWindow*) NULL );
+
+    %property(NavigationType, GetNavigationType, SetNavigationType, doc="See `GetNavigationType` and `SetNavigationType`");
+    %property(URL, GetURL, SetURL, doc="See `GetURL` and `SetURL`");
+};
 
 
 class wxWebKitStateChangedEvent : public wxCommandEvent
@@ -198,6 +284,7 @@ public:
 
 %pythoncode %{
     EVT_WEBKIT_STATE_CHANGED = wx.PyEventBinder(wxEVT_WEBKIT_STATE_CHANGED)
+    EVT_WEBKIT_BEFORE_LOAD = wx.PyEventBinder(wxEVT_WEBKIT_BEFORE_LOAD)
 %}