Fixes for Unicode build.

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

diff --git a/include/wx/html/webkit.h b/include/wx/html/webkit.h
index b0656d9222e3c2b4724198f9de1478b9c330543b..f007cf53022319cdd98c90e37881c722534a475d 100755 (executable)
--- a/include/wx/html/webkit.h
+++ b/include/wx/html/webkit.h
@@ -41,7 +41,7 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                                const wxSize& size = wxDefaultSize, long style = 0,
                                const wxValidator& validator = wxDefaultValidator,
                     const wxPoint& pos = wxDefaultPosition,
                                const wxSize& size = wxDefaultSize, long style = 0,
                                const wxValidator& validator = wxDefaultValidator,

-                               const wxString& name = wxString("default_webkit_name"))
+                               const wxString& name = wxT("webkitctrl"))

     {
         Create(parent, winID, strURL, pos, size, style, validator, name);
     };
     {
         Create(parent, winID, strURL, pos, size, style, validator, name);
     };


@@ -51,7 +51,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = wxString("default_webkit_name"));
+                const wxString& name = wxT("webkitctrl"));

        virtual ~wxWebKitCtrl();
        
     void LoadURL(const wxString &url);
        virtual ~wxWebKitCtrl();
        
     void LoadURL(const wxString &url);


@@ -64,7 +64,7 @@ public:
     void Stop();
     bool CanGetPageSource();
     wxString GetPageSource();
     void Stop();
     bool CanGetPageSource();
     wxString GetPageSource();

-    void SetPageSource(wxString& source, const wxString& baseUrl = wxString(""));
+    void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString);

     
     //we need to resize the webview when the control size changes
     //void OnSize(wxSizeEvent &event);
     
     //we need to resize the webview when the control size changes
     //void OnSize(wxSizeEvent &event);

diff --git a/src/html/htmlctrl/webkit/webkit.mm b/src/html/htmlctrl/webkit/webkit.mm
index df80d539e6ea956bfa2fbf0a851bdba2aac00fc6..9c9830b291f95354c4ef8e49e297967d6f3c7062 100755 (executable)
--- a/src/html/htmlctrl/webkit/webkit.mm
+++ b/src/html/htmlctrl/webkit/webkit.mm
@@ -10,16 +10,12 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-    #pragma implementation "wxWebKit.h"
+    #pragma implementation "webkit.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-

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


@@ -109,7 +105,7 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
 {
 
     m_currentURL = strURL;
 {
 
     m_currentURL = strURL;

-    m_pageTitle = "";
+    m_pageTitle = wxT("");

  
  //still needed for wxCocoa??
 /*
  
  //still needed for wxCocoa??
 /*


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

-    [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithCString:url.c_str()]]]];
+    [[m_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:wxNSStringWithWxString(url)]]];

 
     m_currentURL = url;
 }
 
     m_currentURL = url;
 }