using new API (no visual difference)

[wxWidgets.git] / src / html / htmlctrl / webkit / webkit.mm

diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index eb667927ca4f1124b100f80cad06b52959c28cec..5e88efa8e4c77ceb8ae1a6a546c71d384f0aaca0 100755 (executable)
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -9,12 +9,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

+#include "wx/splitter.h"

 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 
 #ifndef WX_PRECOMP
     #include "wx/wx.h"


@@ -27,6 +24,7 @@
 #else
 #include "wx/mac/uma.h"
 #include <Carbon/Carbon.h>
 #else
 #include "wx/mac/uma.h"
 #include <Carbon/Carbon.h>

+#include <WebKit/WebKit.h>

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


@@ -39,9 +37,7 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxWebKitCtrl, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxWebKitCtrl, wxControl)

-#endif

 
 BEGIN_EVENT_TABLE(wxWebKitCtrl, wxControl)
     EVT_SIZE(wxWebKitCtrl::OnSize)
 
 BEGIN_EVENT_TABLE(wxWebKitCtrl, wxControl)
     EVT_SIZE(wxWebKitCtrl::OnSize)


@@ -108,12 +104,12 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
 
     m_currentURL = strURL;
     //m_pageTitle = _("Untitled Page");
 
     m_currentURL = strURL;
     //m_pageTitle = _("Untitled Page");

- 
+

  //still needed for wxCocoa??
 /*
     int width, height;
     wxSize sizeInstance;
  //still needed for wxCocoa??
 /*
     int width, height;
     wxSize sizeInstance;

-    if (size.x == -1 || size.y == -1)
+    if (size.x == wxDefaultCoord || size.y == wxDefaultCoord)

     {
         m_parent->GetClientSize(&width, &height);
         sizeInstance.x = width;
     {
         m_parent->GetClientSize(&width, &height);
         sizeInstance.x = width;


@@ -124,12 +120,12 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
         sizeInstance.x = size.x;
         sizeInstance.y = size.y;
     }
         sizeInstance.x = size.x;
         sizeInstance.y = size.y;
     }

-*/  
+*/

     // now create and attach WebKit view...
 #ifdef __WXCOCOA__
     wxControl::Create(parent, m_windowID, pos, sizeInstance, style , validator , name);
     SetSize(pos.x, pos.y, sizeInstance.x, sizeInstance.y);
     // now create and attach WebKit view...
 #ifdef __WXCOCOA__
     wxControl::Create(parent, m_windowID, pos, sizeInstance, style , validator , name);
     SetSize(pos.x, pos.y, sizeInstance.x, sizeInstance.y);

-    
+

     wxTopLevelWindowCocoa *topWin = wxDynamicCast(this, wxTopLevelWindowCocoa);
     NSWindow* nsWin = topWin->GetNSWindow();
     NSRect rect;
     wxTopLevelWindowCocoa *topWin = wxDynamicCast(this, wxTopLevelWindowCocoa);
     NSWindow* nsWin = topWin->GetNSWindow();
     NSRect rect;


@@ -145,21 +141,25 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
     SetInitialFrameRect(pos,sizeInstance);
 #else
     m_macIsUserPane = false;
     SetInitialFrameRect(pos,sizeInstance);
 #else
     m_macIsUserPane = false;

-    m_peer = new wxMacControl();
-    wxControl::Create(parent, m_windowID, pos, size, style , validator , name);
+    wxControl::Create(parent, winID, pos, size, style , validator , name);
+    m_peer = new wxMacControl(this);

     WebInitForCarbon();
     HIWebViewCreate( m_peer->GetControlRefAddr() );
     WebInitForCarbon();
     HIWebViewCreate( m_peer->GetControlRefAddr() );

-    
+

     m_webView = (WebView*) HIWebViewGetWebView( m_peer->GetControlRef() );
     MacPostControlCreate(pos, size);
     m_webView = (WebView*) HIWebViewGetWebView( m_peer->GetControlRef() );
     MacPostControlCreate(pos, size);

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

     [m_webView setHidden:false];
     [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 ) ;
+#endif

 #endif
 
     // Register event listener interfaces
     MyFrameLoadMonitor* myFrameLoadMonitor = [[MyFrameLoadMonitor alloc] initWithWxWindow: (wxWindow*)this];
     [m_webView setFrameLoadDelegate:myFrameLoadMonitor];
 #endif
 
     // Register event listener interfaces
     MyFrameLoadMonitor* myFrameLoadMonitor = [[MyFrameLoadMonitor alloc] initWithWxWindow: (wxWindow*)this];
     [m_webView setFrameLoadDelegate:myFrameLoadMonitor];

-    
+

     LoadURL(m_currentURL);
     return true;
 }
     LoadURL(m_currentURL);
     return true;
 }


@@ -177,7 +177,7 @@ void wxWebKitCtrl::LoadURL(const wxString &url)
 {
     if( !m_webView )
         return;
 {
     if( !m_webView )
         return;

-        
+

     [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:wxNSStringWithWxString(url)]]];
 
     m_currentURL = url;
     [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:wxNSStringWithWxString(url)]]];
 
     m_currentURL = url;


@@ -186,69 +186,69 @@ void wxWebKitCtrl::LoadURL(const wxString &url)
 bool wxWebKitCtrl::CanGoBack(){
     if ( !m_webView )
         return false;
 bool wxWebKitCtrl::CanGoBack(){
     if ( !m_webView )
         return false;

-        
+

     return [m_webView canGoBack];
 }
 
 bool wxWebKitCtrl::CanGoForward(){
     if ( !m_webView )
         return false;
     return [m_webView canGoBack];
 }
 
 bool wxWebKitCtrl::CanGoForward(){
     if ( !m_webView )
         return false;

-        
+

     return [m_webView canGoForward];
 }
 
 bool wxWebKitCtrl::GoBack(){
     if ( !m_webView )
         return false;
     return [m_webView canGoForward];
 }
 
 bool wxWebKitCtrl::GoBack(){
     if ( !m_webView )
         return false;

-    
+

     bool result = [(WebView*)m_webView goBack];
     return result;
 }
 
     bool result = [(WebView*)m_webView goBack];
     return result;
 }
 

-bool wxWebKitCtrl::GoForward(){ 
+bool wxWebKitCtrl::GoForward(){

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

-        
+

     bool result = [(WebView*)m_webView goForward];
     return result;
 }
 
     bool result = [(WebView*)m_webView goForward];
     return result;
 }
 

-void wxWebKitCtrl::Reload(){ 
+void wxWebKitCtrl::Reload(){

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

-        
+

     [[m_webView mainFrame] reload];
 }
 
 void wxWebKitCtrl::Stop(){
     if ( !m_webView )
         return;
     [[m_webView mainFrame] reload];
 }
 
 void wxWebKitCtrl::Stop(){
     if ( !m_webView )
         return;

-        
+

     [[m_webView mainFrame] stopLoading];
 }
 
 bool wxWebKitCtrl::CanGetPageSource(){
     if ( !m_webView )
         return false;
     [[m_webView mainFrame] stopLoading];
 }
 
 bool wxWebKitCtrl::CanGetPageSource(){
     if ( !m_webView )
         return false;

-        
+

     WebDataSource* dataSource = [[m_webView mainFrame] dataSource];
     return ( [[dataSource representation] canProvideDocumentSource] );
 }
 
 wxString wxWebKitCtrl::GetPageSource(){
     WebDataSource* dataSource = [[m_webView mainFrame] dataSource];
     return ( [[dataSource representation] canProvideDocumentSource] );
 }
 
 wxString wxWebKitCtrl::GetPageSource(){

-    
+

     if (CanGetPageSource()){
         WebDataSource* dataSource = [[m_webView mainFrame] dataSource];
         return wxStringWithNSString( [[dataSource representation] documentSource] );
     }
     if (CanGetPageSource()){
         WebDataSource* dataSource = [[m_webView mainFrame] dataSource];
         return wxStringWithNSString( [[dataSource representation] documentSource] );
     }

-    
-    return wxT("");
+
+    return wxEmptyString;

 }
 
 void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
     if ( !m_webView )
         return;
 }
 
 void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
     if ( !m_webView )
         return;

-    
+

     if (CanGetPageSource()){
         [[m_webView mainFrame] loadHTMLString:(NSString*)wxNSStringWithWxString( source ) baseURL:[NSURL URLWithString:wxNSStringWithWxString( baseUrl )]];
     }
     if (CanGetPageSource()){
         [[m_webView mainFrame] loadHTMLString:(NSString*)wxNSStringWithWxString( source ) baseURL:[NSURL URLWithString:wxNSStringWithWxString( baseUrl )]];
     }


@@ -258,60 +258,142 @@ void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
 void wxWebKitCtrl::OnSize(wxSizeEvent &event){
     // 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.
 void wxWebKitCtrl::OnSize(wxSizeEvent &event){
     // 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 basically
+    // guesses based on reverse engineering, so it's best to give people the option of
+    // overriding OnSize with their own calcs if need be.
+    // 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* parent = GetParent();

-    bool isParentTopLevel = true;
-    if (!parent->IsTopLevel())
-        isParentTopLevel = false;
-        
-    int x = GetPosition().x;
-    // we must take into account the title bar size as well, which is 26 pixels
-    int y = GetPosition().y + 26;
-        
-    NSRect bounds = [m_webView frame];
-    wxWindow* tlw = NULL;
-    
+
+    wxWindow* tlw = MacGetTopLevelWindow();
+
+    // 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){
+        return;
+    }
+

     while(parent != NULL)
     {
     while(parent != NULL)
     {

-        if (parent->IsTopLevel())
-            tlw = parent;
-
-        x += parent->GetPosition().x;
-        y += parent->GetPosition().y;
-        
-        if ( parent->IsKindOf( CLASSINFO( wxNotebook ) )  ){
-            //manually account for the size the tabs take up
-            y += 14;
+        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
+                // coordinates, but when the parent is a wxSplitterWindow, we need to manually calculate
+                // the sash position of it and any parent wxSplitterWindows into the webkit's position.
+                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)
+                        y += splitter->GetSashSize();
+
+                    if (splitter->GetSashPosition() > 0)
+                        y += splitter->GetSashPosition();
+                }
+                else{
+                    if (splitter->GetPosition().x > 0)
+                        x += splitter->GetPosition().x;
+
+                    if (splitter->GetSashSize() > 0)
+                        x += splitter->GetSashSize();
+
+                    if (splitter->GetSashPosition() > 0)
+                        x += splitter->GetSashPosition();
+                }
+        }
+        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;
+            }

         }
         }

-        
-        //if ( parent->GetClassInfo()->GetClassName() == wxT("wxSplitterWindow") ){
-        //    x += 3;
-        //}
-        
+

         parent = parent->GetParent();
     }
         parent = parent->GetParent();
     }

-    
-    if (!isParentTopLevel){
-        if (tlw){
-            //x = tlw->GetSize().x - (GetSize().x + x);
-            y = tlw->GetSize().y - (GetSize().y + y);
-        }
-        NSRect bounds = [m_webView frame];
-        bounds.origin.x += x;
-        bounds.origin.y += y;
-        //leaving debug checks in until I know it works everywhere ;-)
-        //printf("Added to bounds x=%d, y=%d\n", x, y);
-        [m_webView setFrame:bounds];
+
+    // 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);
+    NSRect bounds = [m_webView frame];
+    bounds.origin.x = x;
+    bounds.origin.y = y;
+    [m_webView setFrame:bounds];
+

     //printf("Carbon position x=%d, y=%d\n", GetPosition().x, GetPosition().y);
     //printf("Carbon position x=%d, y=%d\n", GetPosition().x, GetPosition().y);

-    
-    [m_webView display];
+    if (IsShown())
+        [(WebView*)m_webView display];

     event.Skip();
 }
 
 void wxWebKitCtrl::MacVisibilityChanged(){
     bool isHidden = !IsControlVisible( m_peer->GetControlRef());
     event.Skip();
 }
 
 void wxWebKitCtrl::MacVisibilityChanged(){
     bool isHidden = !IsControlVisible( m_peer->GetControlRef());

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

     [m_webView setHidden:isHidden];
 }
 
     [m_webView setHidden:isHidden];
 }
 


@@ -386,7 +468,7 @@ void wxWebKitCtrl::MacVisibilityChanged(){
 - (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame
 {
     if (frame == [sender mainFrame]){
 - (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame
 {
     if (frame == [sender mainFrame]){

-        webKitWindow->SetTitle(wxStringWithNSString( title ));
+        webKitWindow->SetLabel(wxStringWithNSString( title ));

     }
 }
 @end
     }
 }
 @end