[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
kevino at webkit.org
kevino at webkit.org
Thu Apr 8 00:52:26 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit bbe20d74d0471c7985bc266c158e220986a1e3fc
Author: kevino at webkit.org <kevino at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 30 19:26:15 2009 +0000
Reviewed by Kevin Ollivier.
Introduce wxWebSettings API interface for editing wxWebView / page settings.
https://bugs.webkit.org/show_bug.cgi?id=32956
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52668 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 94d969b..0ce8153 100644
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,40 @@
+2009-12-30 Kevin Watters <kevinwatters at gmail.com>
+
+ Reviewed by Kevin Ollivier.
+
+ Introduce wxWebSettings API interface for editing wxWebView / page settings.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32956
+
+ * WebBrowserShell.h:
+ * WebFrame.h:
+ * WebKitDefines.h: Added.
+ * WebSettings.cpp: Added.
+ (wxWebSettings::SetDefaultFixedFontSize):
+ (wxWebSettings::GetDefaultFixedFontSize):
+ (wxWebSettings::SetDefaultFontSize):
+ (wxWebSettings::GetDefaultFontSize):
+ (wxWebSettings::SetMinimumFontSize):
+ (wxWebSettings::GetMinimumFontSize):
+ (wxWebSettings::SetLoadsImagesAutomatically):
+ (wxWebSettings::LoadsImagesAutomatically):
+ (wxWebSettings::SetJavaScriptEnabled):
+ (wxWebSettings::IsJavaScriptEnabled):
+ (wxWebSettings::SetDatabasesEnabled):
+ (wxWebSettings::AreDatabasesEnabled):
+ (wxWebSettings::SetLocalStoragePath):
+ (wxWebSettings::GetLocalStoragePath):
+ (wxWebSettings::SetEditableLinkBehavior):
+ (wxWebSettings::GetEditableLinkBehavior):
+ (wxWebSettings::SetPluginsEnabled):
+ (wxWebSettings::ArePluginsEnabled):
+ * WebSettings.h: Added.
+ * WebView.cpp:
+ (wxWebView::Create):
+ (wxWebView::GetWebSettings):
+ * WebView.h:
+ * bindings/python/webview.i:
+
2009-12-28 Patrick Gansterer <paroga at paroga.com>
Reviewed by Maciej Stachowiak.
diff --git a/WebKit/wx/WebBrowserShell.h b/WebKit/wx/WebBrowserShell.h
index edda9e4..2f43ffb 100644
--- a/WebKit/wx/WebBrowserShell.h
+++ b/WebKit/wx/WebBrowserShell.h
@@ -33,6 +33,7 @@
#include "wx/wx.h"
#endif
+#include "WebKitDefines.h"
#include "WebView.h"
#include <wx/srchctrl.h>
diff --git a/WebKit/wx/WebFrame.h b/WebKit/wx/WebFrame.h
index bd4bdb0..e8fc6b6 100644
--- a/WebKit/wx/WebFrame.h
+++ b/WebKit/wx/WebFrame.h
@@ -33,6 +33,8 @@
#include "wx/wx.h"
#endif
+#include "WebKitDefines.h"
+
class WebFramePrivate;
class WebViewFrameData;
class wxWebView;
@@ -44,20 +46,6 @@ namespace WebCore {
class Frame;
}
-#ifndef SWIG
-
-#if !wxCHECK_VERSION(2,9,0) && wxCHECK_GCC_VERSION(4,0)
-#define WXDLLIMPEXP_WEBKIT __attribute__ ((visibility("default")))
-#elif WXMAKINGDLL_WEBKIT
-#define WXDLLIMPEXP_WEBKIT WXEXPORT
-#elif defined(WXUSINGDLL_WEBKIT)
-#define WXDLLIMPEXP_WEBKIT WXIMPORT
-#endif
-
-#else
-#define WXDLLIMPEXP_WEBKIT
-#endif // SWIG
-
class WXDLLIMPEXP_WEBKIT wxWebViewDOMElementInfo
{
public:
diff --git a/WebKit/wx/WebKitDefines.h b/WebKit/wx/WebKitDefines.h
new file mode 100644
index 0000000..d973063
--- /dev/null
+++ b/WebKit/wx/WebKitDefines.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2008 Kevin Ollivier <kevino at theolliviers.com>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebKitDefines_h
+#define WebKitDefines_h
+
+#ifndef SWIG
+
+#if !wxCHECK_VERSION(2, 9, 0) && wxCHECK_GCC_VERSION(4, 0)
+#define WXDLLIMPEXP_WEBKIT __attribute__ ((visibility("default")))
+#elif defined(WXMAKINGDLL_WEBKIT)
+#define WXDLLIMPEXP_WEBKIT WXEXPORT
+#elif defined(WXUSINGDLL_WEBKIT)
+#define WXDLLIMPEXP_WEBKIT WXIMPORT
+#endif
+
+#else
+#define WXDLLIMPEXP_WEBKIT
+#endif // SWIG
+
+#endif // WebKitDefines_h
diff --git a/WebKit/wx/WebSettings.cpp b/WebKit/wx/WebSettings.cpp
new file mode 100644
index 0000000..2aa246c
--- /dev/null
+++ b/WebKit/wx/WebSettings.cpp
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2009 Kevin Ollivier. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebSettings.h"
+
+#include "PlatformString.h"
+#include "Settings.h"
+
+void wxWebSettings::SetDefaultFixedFontSize(int size)
+{
+ if (m_settings)
+ m_settings->setDefaultFixedFontSize(size);
+}
+
+int wxWebSettings::GetDefaultFixedFontSize() const
+{
+ if (m_settings)
+ return m_settings->defaultFixedFontSize();
+
+ return 0;
+}
+
+void wxWebSettings::SetDefaultFontSize(int size)
+{
+ if (m_settings)
+ m_settings->setDefaultFontSize(size);
+}
+
+int wxWebSettings::GetDefaultFontSize() const
+{
+ if (m_settings)
+ return m_settings->defaultFontSize();
+
+ return 0;
+}
+
+void wxWebSettings::SetMinimumFontSize(int size)
+{
+ if (m_settings)
+ m_settings->setMinimumFontSize(size);
+}
+
+int wxWebSettings::GetMinimumFontSize() const
+{
+ if (m_settings)
+ return m_settings->minimumFontSize();
+
+ return 0;
+}
+
+void wxWebSettings::SetLoadsImagesAutomatically(bool loadAutomatically)
+{
+ if (m_settings)
+ m_settings->setLoadsImagesAutomatically(loadAutomatically);
+}
+
+bool wxWebSettings::LoadsImagesAutomatically() const
+{
+ if (m_settings)
+ return m_settings->loadsImagesAutomatically();
+
+ return false;
+}
+
+void wxWebSettings::SetJavaScriptEnabled(bool enabled)
+{
+ if (m_settings)
+ m_settings->setJavaScriptEnabled(enabled);
+}
+
+bool wxWebSettings::IsJavaScriptEnabled() const
+{
+ if (m_settings)
+ return m_settings->isJavaScriptEnabled();
+
+ return false;
+}
+
+void wxWebSettings::SetDatabasesEnabled(bool enabled)
+{
+ if (m_settings)
+ m_settings->setDatabasesEnabled(enabled);
+}
+
+bool wxWebSettings::AreDatabasesEnabled() const
+{
+ if (m_settings)
+ return m_settings->databasesEnabled();
+
+ return false;
+}
+
+void wxWebSettings::SetLocalStoragePath(const wxString& path)
+{
+ if (m_settings)
+ m_settings->setLocalStorageDatabasePath(path);
+}
+
+wxString wxWebSettings::GetLocalStoragePath() const
+{
+ if (m_settings)
+ return m_settings->localStorageDatabasePath();
+
+ return wxEmptyString;
+}
+
+void wxWebSettings::SetEditableLinkBehavior(wxEditableLinkBehavior behavior)
+{
+ WebCore::EditableLinkBehavior webCoreBehavior;
+ if (m_settings) {
+ switch (behavior) {
+ case wxEditableLinkAlwaysLive:
+ webCoreBehavior = WebCore::EditableLinkAlwaysLive;
+ break;
+ case wxEditableLinkOnlyLiveWithShiftKey:
+ webCoreBehavior = WebCore::EditableLinkOnlyLiveWithShiftKey;
+ break;
+ case wxEditableLinkLiveWhenNotFocused:
+ webCoreBehavior = WebCore::EditableLinkLiveWhenNotFocused;
+ break;
+ case wxEditableLinkNeverLive:
+ webCoreBehavior = WebCore::EditableLinkNeverLive;
+ break;
+ default:
+ webCoreBehavior = WebCore::EditableLinkDefaultBehavior;
+ }
+ m_settings->setEditableLinkBehavior(webCoreBehavior);
+ }
+}
+
+wxEditableLinkBehavior wxWebSettings::GetEditableLinkBehavior() const
+{
+ wxEditableLinkBehavior behavior = wxEditableLinkDefaultBehavior;
+ if (m_settings) {
+ WebCore::EditableLinkBehavior webCoreBehavior = m_settings->editableLinkBehavior();
+ switch (webCoreBehavior) {
+ case WebCore::EditableLinkAlwaysLive:
+ behavior = wxEditableLinkAlwaysLive;
+ break;
+ case WebCore::EditableLinkOnlyLiveWithShiftKey:
+ behavior = wxEditableLinkOnlyLiveWithShiftKey;
+ break;
+ case WebCore::EditableLinkLiveWhenNotFocused:
+ behavior = wxEditableLinkLiveWhenNotFocused;
+ break;
+ case WebCore::EditableLinkNeverLive:
+ behavior = wxEditableLinkNeverLive;
+ break;
+ default:
+ behavior = wxEditableLinkDefaultBehavior;
+ }
+ }
+ return behavior;
+}
+
+void wxWebSettings::SetPluginsEnabled(bool enabled)
+{
+ if (m_settings)
+ m_settings->setPluginsEnabled(enabled);
+}
+
+bool wxWebSettings::ArePluginsEnabled() const
+{
+ if (m_settings)
+ return m_settings->arePluginsEnabled();
+
+ return false;
+}
diff --git a/WebKit/wx/WebSettings.h b/WebKit/wx/WebSettings.h
new file mode 100644
index 0000000..e526b70
--- /dev/null
+++ b/WebKit/wx/WebSettings.h
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2009 Kevin Ollivier. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebSettings_h
+#define WebSettings_h
+
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+ #include "wx/wx.h"
+#endif
+
+#include "WebKitDefines.h"
+
+namespace WebCore {
+class Settings;
+}
+
+enum wxEditableLinkBehavior {
+ wxEditableLinkDefaultBehavior,
+ wxEditableLinkAlwaysLive,
+ wxEditableLinkOnlyLiveWithShiftKey,
+ wxEditableLinkLiveWhenNotFocused,
+ wxEditableLinkNeverLive
+};
+
+/**
+ @class wxWebSettings
+
+ This class is used to control the configurable aspects of the WebKit engine.
+
+ Do not instantiate this object directly. Instead, create a wxWebView and
+ call its wxWebView::GetWebSettings() method to get and change that WebView's settings.
+
+*/
+
+class WXDLLIMPEXP_WEBKIT wxWebSettings: public wxObject {
+public:
+ wxWebSettings(WebCore::Settings* settings) :
+ wxObject(),
+ m_settings(settings)
+ {}
+
+ wxWebSettings() : wxObject() {}
+
+ /**
+ Sets the default font size for fixed fonts.
+ */
+ void SetDefaultFixedFontSize(int size);
+
+ /**
+ Returns the default font size for fixed fonts.
+ */
+ int GetDefaultFixedFontSize() const;
+
+ /**
+ Sets the default font size for fonts.
+ */
+ void SetDefaultFontSize(int size);
+
+ /**
+ Returns the default font size for fonts.
+ */
+ int GetDefaultFontSize() const;
+
+ /**
+ Sets the minimum acceptable font size.
+ */
+ void SetMinimumFontSize(int size);
+
+ /**
+ Returns the minimum acceptable font size.
+ */
+ int GetMinimumFontSize() const;
+
+ /**
+ Sets whether or not images are loaded automatically. (e.g. in email
+ programs you may wish to not load images until you confirm it is not SPAM)
+ */
+ void SetLoadsImagesAutomatically(bool loadAutomatically);
+
+ /**
+ Returns whether or not images are loaded automatically.
+ */
+ bool LoadsImagesAutomatically() const;
+
+ /**
+ Sets whether or not the WebView runs JavaScript code.
+ */
+ void SetJavaScriptEnabled(bool enabled);
+
+ /**
+ Returns whether or not the WebView runs JavaScript code.
+ */
+ bool IsJavaScriptEnabled() const;
+
+ /**
+ Sets whether or not web pages can create databases.
+ */
+ void SetDatabasesEnabled(bool enabled);
+
+ /**
+ Returns whether or not the WebView runs JavaScript code.
+ */
+ bool AreDatabasesEnabled() const;
+
+ /**
+ Sets the path where local data will be stored.
+ */
+ void SetLocalStoragePath(const wxString& path);
+
+ /**
+ Returns the path where local data will be stored.
+ */
+ wxString GetLocalStoragePath() const;
+
+ /**
+ Sets how links are handled when the wxWebView is in editing mode.
+ */
+ void SetEditableLinkBehavior(wxEditableLinkBehavior behavior);
+
+ /**
+ Returns how links are handled when the wxWebView is in editing mode.
+ */
+ wxEditableLinkBehavior GetEditableLinkBehavior() const;
+
+ /**
+ Sets whether or not web pages can load plugins.
+ */
+ void SetPluginsEnabled(bool enabled);
+
+ /**
+ Returns whether or not web pages can load plugins.
+ */
+ bool ArePluginsEnabled() const;
+
+private:
+ WebCore::Settings* m_settings;
+
+};
+
+#endif // WebSettings_h
diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index 05a7473..5503e85 100644
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -338,10 +338,6 @@ bool wxWebView::Create(wxWindow* parent, int id, const wxPoint& position,
settings->setDatabasesEnabled(true);
#endif
-#if __WXMSW__ || __WXMAC__
- settings->setPluginsEnabled(true);
-#endif
-
m_isInitialized = true;
return true;
@@ -966,3 +962,12 @@ void wxWebView::SetProxyInfo(const wxString& host,
if (ResourceHandleManager* mgr = ResourceHandleManager::sharedInstance())
mgr->setProxyInfo(host, port, curlProxyType(type), username, password);
}
+
+wxWebSettings wxWebView::GetWebSettings()
+{
+ ASSERT(m_impl->page);
+ if (m_impl->page)
+ return wxWebSettings(m_impl->page->settings());
+
+ return wxWebSettings();
+}
diff --git a/WebKit/wx/WebView.h b/WebKit/wx/WebView.h
index 9b1cfab..3f0e987 100644
--- a/WebKit/wx/WebView.h
+++ b/WebKit/wx/WebView.h
@@ -34,6 +34,8 @@
#endif
#include "WebFrame.h"
+#include "WebKitDefines.h"
+#include "WebSettings.h"
class WebViewPrivate;
class WebViewFrameData;
@@ -48,20 +50,6 @@ namespace WebCore {
}
#ifndef SWIG
-
-#if !wxCHECK_VERSION(2,9,0) && wxCHECK_GCC_VERSION(4,0)
-#define WXDLLIMPEXP_WEBKIT __attribute__ ((visibility("default")))
-#elif WXMAKINGDLL_WEBKIT
-#define WXDLLIMPEXP_WEBKIT WXEXPORT
-#elif defined(WXUSINGDLL_WEBKIT)
-#define WXDLLIMPEXP_WEBKIT WXIMPORT
-#endif
-
-#else
-#define WXDLLIMPEXP_WEBKIT
-#endif // SWIG
-
-#ifndef SWIG
extern WXDLLIMPEXP_WEBKIT const wxChar* wxWebViewNameStr;
#endif
@@ -214,6 +202,8 @@ public:
const wxString& username = wxEmptyString,
const wxString& password = wxEmptyString);
+ wxWebSettings GetWebSettings();
+
protected:
// event handlers (these functions should _not_ be virtual)
diff --git a/WebKit/wx/bindings/python/webview.i b/WebKit/wx/bindings/python/webview.i
index 410191a..bdc5561 100644
--- a/WebKit/wx/bindings/python/webview.i
+++ b/WebKit/wx/bindings/python/webview.i
@@ -28,9 +28,12 @@
%{
#include "wx/wxPython/wxPython.h"
#include "wx/wxPython/pyclasses.h"
+
+#include "WebBrowserShell.h"
#include "WebFrame.h"
+#include "WebKitDefines.h"
+#include "WebSettings.h"
#include "WebView.h"
-#include "WebBrowserShell.h"
%}
//---------------------------------------------------------------------------
@@ -39,13 +42,16 @@
MAKE_CONST_WXSTRING(WebViewNameStr);
+MustHaveApp(wxWebBrowserShell);
MustHaveApp(wxWebFrame);
MustHaveApp(wxWebView);
-MustHaveApp(wxWebBrowserShell);
+%include WebKitDefines.h
+
+%include WebBrowserShell.h
%include WebFrame.h
+%include WebSettings.h
%include WebView.h
-%include WebBrowserShell.h
%constant wxEventType wxEVT_WEBVIEW_BEFORE_LOAD;
%constant wxEventType wxEVT_WEBVIEW_LOAD;
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 69c3817..4d2fcb8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-30 Kevin Watters <kevinwatters at gmail.com>
+
+ Reviewed by Kevin Ollivier.
+
+ [wx] Alter a couple of default settings in the test app.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32956
+
+ * wx/browser/browser.cpp:
+ (MyApp::OnInit):
+
2009-12-30 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
diff --git a/WebKitTools/wx/browser/browser.cpp b/WebKitTools/wx/browser/browser.cpp
index 83f909b..df701bb 100644
--- a/WebKitTools/wx/browser/browser.cpp
+++ b/WebKitTools/wx/browser/browser.cpp
@@ -26,8 +26,9 @@
*/
// webkit includes
-#include "WebView.h"
#include "WebBrowserShell.h"
+#include "WebSettings.h"
+#include "WebView.h"
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
@@ -55,6 +56,13 @@ bool MyApp::OnInit()
#ifndef NDEBUG
frame->ShowDebugMenu(true);
#endif
+
+ wxWebSettings settings = frame->webview->GetWebSettings();
+#if __WXMSW__ || __WXMAC__
+ settings.SetPluginsEnabled(true);
+#endif
+ settings.SetDatabasesEnabled(true);
+ settings.SetEditableLinkBehavior(wxEditableLinkOnlyLiveWithShiftKey);
frame->CentreOnScreen();
frame->Show(true);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list