Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for Unicode build.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2004-05-24 21:00:07 +00:00
parent 37699af5bb
commit 7eb8c6ee3e
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/html/webkit.h
View File

@@ -41,7 +41,7 @@ public:
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, 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 wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxString("default_webkit_name")); const wxString& name = wxT("webkitctrl"));
virtual ~wxWebKitCtrl(); virtual ~wxWebKitCtrl();
void LoadURL(const wxString &url); void LoadURL(const wxString &url);
@@ -64,7 +64,7 @@ public:
void Stop(); void Stop();
bool CanGetPageSource(); bool CanGetPageSource();
wxString GetPageSource(); 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 //we need to resize the webview when the control size changes
//void OnSize(wxSizeEvent &event); //void OnSize(wxSizeEvent &event);

10
src/html/htmlctrl/webkit/webkit.mm
View File

@@ -10,16 +10,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "wxWebKit.h" #pragma implementation "webkit.h"
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #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 ) if( !m_webView )
return; 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;
} }