Remove tabs from webview chromium source files
This commit is contained in:
parent
ca6d2d2601
commit
6b03c0aea7
6 changed files with 35 additions and 35 deletions
|
|
@ -143,8 +143,8 @@ private:
|
|||
friend class wxWebViewChromiumModule;
|
||||
static int ms_activeWebViewCount;
|
||||
static bool ms_cefInitialized;
|
||||
|
||||
static void OnIdle(wxIdleEvent& evt);
|
||||
|
||||
static void OnIdle(wxIdleEvent& evt);
|
||||
|
||||
static bool InitCEF();
|
||||
|
||||
|
|
|
|||
|
|
@ -246,11 +246,11 @@ public:
|
|||
<a href="http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/WebKit/Classes/WebView_Class/Reference/Reference.html#//apple_ref/doc/uid/20001903">WebView</a>
|
||||
class. This backend has full support for custom schemes and virtual file
|
||||
systems.
|
||||
|
||||
@par wxWEBVIEW_CHROMIUM (MSW, OSX, GTK)
|
||||
|
||||
The Chromium Embedded Framework backend has to be enabled when building wxWidgets,
|
||||
see wxWebViewChromium for additional usage and build instructions.
|
||||
|
||||
@par wxWEBVIEW_CHROMIUM (MSW, OSX, GTK)
|
||||
|
||||
The Chromium Embedded Framework backend has to be enabled when building wxWidgets,
|
||||
see wxWebViewChromium for additional usage and build instructions.
|
||||
|
||||
@section async Asynchronous Notifications
|
||||
|
||||
|
|
|
|||
|
|
@ -31,11 +31,11 @@
|
|||
|
||||
The wxWebViewChromium backend is built into a separate webview_chromium
|
||||
library which depends on the webview library.
|
||||
|
||||
When building with CMake enable wxUSE_WEBVIEW_CHROMIUM and CEF will
|
||||
automatically downloaded during configuration based on your platform.
|
||||
|
||||
For other build systems please follow the following instructions:
|
||||
|
||||
When building with CMake enable wxUSE_WEBVIEW_CHROMIUM and CEF will
|
||||
automatically downloaded during configuration based on your platform.
|
||||
|
||||
For other build systems please follow the following instructions:
|
||||
|
||||
Once you have a copy of CEF3, either from compiling it yourself or using
|
||||
prebuilt binaries you should copy it into `wx_root/3rdparty/cef`. To run the
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
either by passing --enable-webviewchromium for autoconf based builds or
|
||||
setting wxUSE_WEBVIEW_CHROMIUM equal to 1 in setup.h for Visual Studio
|
||||
based builds.
|
||||
|
||||
|
||||
|
||||
__Mac OS X Platform__
|
||||
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ bool WebApp::OnInit()
|
|||
|
||||
// Create the memory files
|
||||
wxImage::AddHandler(new wxPNGHandler);
|
||||
wxMemoryFSHandler::AddFile("logo.png",
|
||||
wxMemoryFSHandler::AddFile("logo.png",
|
||||
wxBitmap(wxlogo_xpm), wxBITMAP_TYPE_PNG);
|
||||
wxMemoryFSHandler::AddFile("page1.htm",
|
||||
"<html><head><title>File System Example</title>"
|
||||
|
|
@ -375,12 +375,12 @@ WebFrame::WebFrame(const wxString& url) :
|
|||
#ifdef wxWEBVIEW_SAMPLE_CHROMIUM
|
||||
, wxDefaultPosition,
|
||||
#ifdef __WXOSX__
|
||||
// OSX implementation currently cannot handle the default size
|
||||
wxSize(800, 600)
|
||||
// OSX implementation currently cannot handle the default size
|
||||
wxSize(800, 600)
|
||||
#else
|
||||
wxDefaultSize
|
||||
wxDefaultSize
|
||||
#endif
|
||||
, wxWebViewBackendChromium
|
||||
, wxWebViewBackendChromium
|
||||
#endif
|
||||
);
|
||||
topsizer->Add(m_browser, wxSizerFlags().Expand().Proportion(1));
|
||||
|
|
@ -1223,7 +1223,7 @@ void WebFrame::OnSelectAll(wxCommandEvent& WXUNUSED(evt))
|
|||
* Callback invoked when a loading error occurs
|
||||
*/
|
||||
void WebFrame::OnError(wxWebViewEvent& evt)
|
||||
{
|
||||
{
|
||||
#define WX_ERROR_CASE(type) \
|
||||
case type: \
|
||||
category = #type; \
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ public:
|
|||
virtual void OnTitleChange(CefRefPtr<CefBrowser> browser,
|
||||
const CefString& title) wxOVERRIDE;
|
||||
virtual bool OnConsoleMessage(CefRefPtr<CefBrowser> browser,
|
||||
cef_log_severity_t level,
|
||||
cef_log_severity_t level,
|
||||
const CefString& message,
|
||||
const CefString& source,
|
||||
int line) wxOVERRIDE;
|
||||
|
|
@ -287,8 +287,8 @@ bool wxWebViewChromium::Create(wxWindow* parent,
|
|||
this->Bind(wxEVT_SIZE, &wxWebViewChromium::OnSize, this);
|
||||
|
||||
// Initalize CEF message loop handling
|
||||
if (ms_activeWebViewCount == 0)
|
||||
wxTheApp->Bind(wxEVT_IDLE, &wxWebViewChromium::OnIdle);
|
||||
if (ms_activeWebViewCount == 0)
|
||||
wxTheApp->Bind(wxEVT_IDLE, &wxWebViewChromium::OnIdle);
|
||||
ms_activeWebViewCount++;
|
||||
|
||||
return true;
|
||||
|
|
@ -299,7 +299,7 @@ wxWebViewChromium::~wxWebViewChromium()
|
|||
// Delete CEF idle handler when there is no active webview
|
||||
ms_activeWebViewCount--;
|
||||
if (ms_activeWebViewCount == 0)
|
||||
wxTheApp->Unbind(wxEVT_IDLE, &wxWebViewChromium::OnIdle);
|
||||
wxTheApp->Unbind(wxEVT_IDLE, &wxWebViewChromium::OnIdle);
|
||||
|
||||
if (m_clientHandler)
|
||||
{
|
||||
|
|
@ -365,7 +365,7 @@ void wxWebViewChromium::ShutdownCEF()
|
|||
|
||||
void wxWebViewChromium::OnIdle(wxIdleEvent& evt)
|
||||
{
|
||||
CefDoMessageLoopWork();
|
||||
CefDoMessageLoopWork();
|
||||
}
|
||||
|
||||
void wxWebViewChromium::OnSize(wxSizeEvent& event)
|
||||
|
|
@ -405,7 +405,7 @@ void* wxWebViewChromium::GetNativeBackend() const
|
|||
}
|
||||
|
||||
bool wxWebViewChromium::CanGoForward() const
|
||||
{
|
||||
{
|
||||
if ( m_historyEnabled )
|
||||
return m_historyPosition != static_cast<int>(m_historyList.size()) - 1;
|
||||
else
|
||||
|
|
@ -413,7 +413,7 @@ bool wxWebViewChromium::CanGoForward() const
|
|||
}
|
||||
|
||||
bool wxWebViewChromium::CanGoBack() const
|
||||
{
|
||||
{
|
||||
if ( m_historyEnabled )
|
||||
return m_historyPosition > 0;
|
||||
else
|
||||
|
|
@ -471,7 +471,7 @@ void wxWebViewChromium::GoForward()
|
|||
}
|
||||
|
||||
void wxWebViewChromium::LoadURL(const wxString& url)
|
||||
{
|
||||
{
|
||||
m_clientHandler->GetBrowser()->GetMainFrame()->LoadURL(url.ToStdString());
|
||||
}
|
||||
|
||||
|
|
@ -508,7 +508,7 @@ wxString wxWebViewChromium::GetPageSource() const
|
|||
return m_pageSource;
|
||||
}
|
||||
|
||||
wxString wxWebViewChromium::GetPageText() const
|
||||
wxString wxWebViewChromium::GetPageText() const
|
||||
{
|
||||
return m_pageText;
|
||||
}
|
||||
|
|
@ -592,7 +592,7 @@ bool wxWebViewChromium::IsBusy() const
|
|||
void wxWebViewChromium::SetEditable(bool enable)
|
||||
{
|
||||
wxString mode = enable ? "\"on\"" : "\"off\"";
|
||||
RunScript("document.designMode = " + mode);
|
||||
RunScript("document.designMode = " + mode);
|
||||
}
|
||||
|
||||
void wxWebViewChromium::DoSetPage(const wxString& html, const wxString& baseUrl)
|
||||
|
|
@ -689,7 +689,7 @@ void ClientHandler::OnTitleChange(CefRefPtr<CefBrowser> browser, const CefString
|
|||
}
|
||||
|
||||
bool ClientHandler::OnConsoleMessage(CefRefPtr<CefBrowser> WXUNUSED(browser),
|
||||
cef_log_severity_t level,
|
||||
cef_log_severity_t level,
|
||||
const CefString& WXUNUSED(message),
|
||||
const CefString& WXUNUSED(source), int WXUNUSED(line))
|
||||
{
|
||||
|
|
@ -724,8 +724,8 @@ bool ClientHandler::OnBeforePopup(CefRefPtr<CefBrowser> WXUNUSED(browser),
|
|||
CefRefPtr<CefFrame> WXUNUSED(frame),
|
||||
const CefString& target_url,
|
||||
const CefString& target_frame_name,
|
||||
WindowOpenDisposition WXUNUSED(target_disposition),
|
||||
bool WXUNUSED(user_gesture),
|
||||
WindowOpenDisposition WXUNUSED(target_disposition),
|
||||
bool WXUNUSED(user_gesture),
|
||||
const CefPopupFeatures& WXUNUSED(popupFeatures),
|
||||
CefWindowInfo& WXUNUSED(windowInfo),
|
||||
CefRefPtr<CefClient>& WXUNUSED(client),
|
||||
|
|
@ -769,8 +769,8 @@ void ClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser)
|
|||
|
||||
// CefLoadHandler methods
|
||||
void ClientHandler::OnLoadStart(CefRefPtr<CefBrowser> WXUNUSED(browser),
|
||||
CefRefPtr<CefFrame> frame,
|
||||
TransitionType WXUNUSED(transition_type))
|
||||
CefRefPtr<CefFrame> frame,
|
||||
TransitionType WXUNUSED(transition_type))
|
||||
{
|
||||
wxString url = frame->GetURL().ToString();
|
||||
wxString target = frame->GetName().ToString();
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ void wxWebViewChromium_InitOSX()
|
|||
Protocol* prot = objc_getProtocol("CefAppProtocol");
|
||||
if (prot)
|
||||
{
|
||||
Class appClass = objc_getClass("wxNSApplication");
|
||||
Class appClass = objc_getClass("wxNSApplication");
|
||||
class_addProtocol(appClass, prot);
|
||||
if (!class_addMethod(appClass, @selector(isHandlingSendEvent), &isHandlingSendEventImpl, "c@:"))
|
||||
wxLogError("Could not add isHandlingSendEvent impl");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue