Yet more fixes for wxNotebook compatibility...

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

diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index adb86342ff202e5147157df251482d51e1d43a64..8a258839aa152cdc38ae2be79d23915d2f6d45ed 100755 (executable)
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -257,19 +257,26 @@ void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){
 void wxWebKitCtrl::OnSize(wxSizeEvent &event){
     wxWindow* parent = GetParent();
     bool inNotebook = false;
 void wxWebKitCtrl::OnSize(wxSizeEvent &event){
     wxWindow* parent = GetParent();
     bool inNotebook = false;

-    int x, y; 
+    int x = 0;
+    int y = 18; 

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

+        x += parent->GetPosition().x;
+        y += parent->GetPosition().y;

         if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ){
         if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) ){

-            NSRect bounds = [m_webView frame];
-            bounds.origin.x += parent->GetPosition().x;
-            bounds.origin.y += 18;
-            [m_webView setFrame:bounds];
+            inNotebook = true;

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

+    if (inNotebook){
+        NSRect bounds = [m_webView frame];
+        bounds.origin.x += x;
+        bounds.origin.y += y;
+        [m_webView setFrame:bounds];
+    }
+    

     [m_webView display];
     event.Skip();
 }
     [m_webView display];
     event.Skip();
 }