Fix uninitialized variable warning in wxMSW wxFileSystemWatcher code.

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

diff --git a/src/osx/webview_webkit.mm b/src/osx/webview_webkit.mm
index 745f0194e9f08be910458c227b4169a86c44dd1d..883fba00f24291fc894a7bb0929e6102835df82d 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"


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


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


@@ -1018,13 +1018,13 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> 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]);

-        wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
-                                           webKitWindow->GetId(),
-                                           wxStringWithNSString( url ),
-                                           target, false);
+        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_NAVIGATED,
+                             webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             target);

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

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

     }
 }
 
     }
 }
 


@@ -1036,13 +1036,13 @@ void wxWebViewWebKit::RegisterHandler(wxSharedPtr<wxWebViewHandler> 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]);

-        wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_LOADED,
-                                           webKitWindow->GetId(),
-                                           wxStringWithNSString( url ),
-                                           target, false);
+        wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_LOADED,
+                             webKitWindow->GetId(),
+                             wxStringWithNSString( url ),
+                             target);

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

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

     }
 }
 
     }
 }
 


@@ -1062,7 +1062,9 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
             case NSURLErrorResourceUnavailable:
             case NSURLErrorHTTPTooManyRedirects:
 
             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:
                 *out = wxWEB_NAV_ERR_REQUEST;
             case NSURLErrorBadURL:
             case NSURLErrorFileIsDirectory:
                 *out = wxWEB_NAV_ERR_REQUEST;


@@ -1084,16 +1086,20 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
                 *out = wxWEB_NAV_ERR_USER_CANCELLED;
                 break;
 
                 *out = wxWEB_NAV_ERR_USER_CANCELLED;
                 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:

+#endif
+            case NSURLErrorBadServerResponse:

                 *out = wxWEB_NAV_ERR_REQUEST;
                 break;
 
             case NSURLErrorUserAuthenticationRequired:
             case NSURLErrorSecureConnectionFailed:
                 *out = wxWEB_NAV_ERR_REQUEST;
                 break;
 
             case NSURLErrorUserAuthenticationRequired:
             case NSURLErrorSecureConnectionFailed:

+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6

             case NSURLErrorClientCertificateRequired:
             case NSURLErrorClientCertificateRequired:

+#endif

                 *out = wxWEB_NAV_ERR_AUTH;
                 break;
 
                 *out = wxWEB_NAV_ERR_AUTH;
                 break;
 


@@ -1130,16 +1136,16 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
         wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);
 
         wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);

-               wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
-                                                  webKitWindow->GetId(),
-                                           wxStringWithNSString( url ),
-                                           wxEmptyString, false);
-               thisEvent.SetString(description);
-               thisEvent.SetInt(type);
+               wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_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);

                }
     }
 }
                }
     }
 }


@@ -1156,15 +1162,15 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
                wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);
 
                wxWebViewNavigationError type;
         wxString description = nsErrorToWxHtmlError(error, &type);

-               wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_ERROR,
-                                                  webKitWindow->GetId(),
-                                           wxStringWithNSString( url ),
-                                           wxEmptyString, false);
-               thisEvent.SetString(description);
-               thisEvent.SetInt(type);
+               wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_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 +1178,15 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
                                          forFrame:(WebFrame *)frame
 {
     wxString target = wxStringWithNSString([frame name]);
                                          forFrame:(WebFrame *)frame
 {
     wxString target = wxStringWithNSString([frame name]);

-    wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED,
-                                       webKitWindow->GetId(),
-                                       webKitWindow->GetCurrentURL(),
-                                       target, true);
-                                   
-    thisEvent.SetString(wxStringWithNSString(title));
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_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 +1210,14 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* 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]);

-    wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NAVIGATING,
-                                       webKitWindow->GetId(),
-                                       wxStringWithNSString( url ), target, true);
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_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 +1228,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* 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 +1237,12 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
     wxUnusedVar(actionInformation);
 
     NSString *url = [[request URL] absoluteString];
     wxUnusedVar(actionInformation);
 
     NSString *url = [[request URL] absoluteString];

-    wxWebViewNavigationEvent thisEvent(wxEVT_COMMAND_WEB_VIEW_NEWWINDOW,
-                                       webKitWindow->GetId(),
-                                       wxStringWithNSString( url ), "", true);
+    wxWebViewEvent event(wxEVT_COMMAND_WEB_VIEW_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];
 }


@@ -1279,18 +1285,18 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
     NSURLResponse *response =  [[NSURLResponse alloc] initWithURL:[request URL]
                                           MIMEType:wxNSStringWithWxString(file->GetMimeType())
 
     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
     id<NSURLProtocolClient> client = [self client];
 
     //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 +1315,4 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
 
 @end
 
 
 @end
 

-#endif //wxUSE_WEBVIEW_WEBKIT
+#endif //wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT