minor fixes; replace references to Windows95 with references to wxMSW where possible

[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 7adc98dff0393432f922b09ead069bea4c4857b4..27216cb00b34cc72afebc37dc6517c872425bb38 100644 (file)
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -26,7 +26,7 @@
 #ifdef __WXCOCOA__
 #include "wx/cocoa/autorelease.h"
 #else
 #ifdef __WXCOCOA__
 #include "wx/cocoa/autorelease.h"
 #else

-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"

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


@@ -682,8 +682,8 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
 
     wxWindow* tlw = MacGetTopLevelWindow();
 
 
     wxWindow* tlw = MacGetTopLevelWindow();
 

-    NSRect frame = [m_webView frame];
-    NSRect bounds = [m_webView bounds];
+    NSRect frame = [(WebView*)m_webView frame];
+    NSRect bounds = [(WebView*)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);
 
 #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);


@@ -734,7 +734,7 @@ void wxWebKitCtrl::OnSize(wxSizeEvent &event){
 
     frame.origin.x = x;
     frame.origin.y = y;
 
     frame.origin.x = x;
     frame.origin.y = y;

-    [m_webView setFrame:frame];
+    [(WebView*)m_webView setFrame:frame];

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