Changeset 52668 in webkit
- Timestamp:
- Dec 30, 2009 11:26:15 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/wx/ChangeLog
r52598 r52668 1 2009-12-30 Kevin Watters <kevinwatters@gmail.com> 2 3 Reviewed by Kevin Ollivier. 4 5 Introduce wxWebSettings API interface for editing wxWebView / page settings. 6 7 https://bugs.webkit.org/show_bug.cgi?id=32956 8 9 * WebBrowserShell.h: 10 * WebFrame.h: 11 * WebKitDefines.h: Added. 12 * WebSettings.cpp: Added. 13 (wxWebSettings::SetDefaultFixedFontSize): 14 (wxWebSettings::GetDefaultFixedFontSize): 15 (wxWebSettings::SetDefaultFontSize): 16 (wxWebSettings::GetDefaultFontSize): 17 (wxWebSettings::SetMinimumFontSize): 18 (wxWebSettings::GetMinimumFontSize): 19 (wxWebSettings::SetLoadsImagesAutomatically): 20 (wxWebSettings::LoadsImagesAutomatically): 21 (wxWebSettings::SetJavaScriptEnabled): 22 (wxWebSettings::IsJavaScriptEnabled): 23 (wxWebSettings::SetDatabasesEnabled): 24 (wxWebSettings::AreDatabasesEnabled): 25 (wxWebSettings::SetLocalStoragePath): 26 (wxWebSettings::GetLocalStoragePath): 27 (wxWebSettings::SetEditableLinkBehavior): 28 (wxWebSettings::GetEditableLinkBehavior): 29 (wxWebSettings::SetPluginsEnabled): 30 (wxWebSettings::ArePluginsEnabled): 31 * WebSettings.h: Added. 32 * WebView.cpp: 33 (wxWebView::Create): 34 (wxWebView::GetWebSettings): 35 * WebView.h: 36 * bindings/python/webview.i: 37 1 38 2009-12-28 Patrick Gansterer <paroga@paroga.com> 2 39 -
trunk/WebKit/wx/WebBrowserShell.h
r43265 r52668 34 34 #endif 35 35 36 #include "WebKitDefines.h" 36 37 #include "WebView.h" 37 38 #include <wx/srchctrl.h> -
trunk/WebKit/wx/WebFrame.h
r48347 r52668 34 34 #endif 35 35 36 #include "WebKitDefines.h" 37 36 38 class WebFramePrivate; 37 39 class WebViewFrameData; … … 44 46 class Frame; 45 47 } 46 47 #ifndef SWIG48 49 #if !wxCHECK_VERSION(2,9,0) && wxCHECK_GCC_VERSION(4,0)50 #define WXDLLIMPEXP_WEBKIT __attribute__ ((visibility("default")))51 #elif WXMAKINGDLL_WEBKIT52 #define WXDLLIMPEXP_WEBKIT WXEXPORT53 #elif defined(WXUSINGDLL_WEBKIT)54 #define WXDLLIMPEXP_WEBKIT WXIMPORT55 #endif56 57 #else58 #define WXDLLIMPEXP_WEBKIT59 #endif // SWIG60 48 61 49 class WXDLLIMPEXP_WEBKIT wxWebViewDOMElementInfo -
trunk/WebKit/wx/WebView.cpp
r52420 r52668 337 337 #if ENABLE(DATABASE) 338 338 settings->setDatabasesEnabled(true); 339 #endif340 341 #if __WXMSW__ || __WXMAC__342 settings->setPluginsEnabled(true);343 339 #endif 344 340 … … 967 963 mgr->setProxyInfo(host, port, curlProxyType(type), username, password); 968 964 } 965 966 wxWebSettings wxWebView::GetWebSettings() 967 { 968 ASSERT(m_impl->page); 969 if (m_impl->page) 970 return wxWebSettings(m_impl->page->settings()); 971 972 return wxWebSettings(); 973 } -
trunk/WebKit/wx/WebView.h
r49752 r52668 35 35 36 36 #include "WebFrame.h" 37 #include "WebKitDefines.h" 38 #include "WebSettings.h" 37 39 38 40 class WebViewPrivate; … … 47 49 class FrameLoaderClientWx; 48 50 } 49 50 #ifndef SWIG51 52 #if !wxCHECK_VERSION(2,9,0) && wxCHECK_GCC_VERSION(4,0)53 #define WXDLLIMPEXP_WEBKIT __attribute__ ((visibility("default")))54 #elif WXMAKINGDLL_WEBKIT55 #define WXDLLIMPEXP_WEBKIT WXEXPORT56 #elif defined(WXUSINGDLL_WEBKIT)57 #define WXDLLIMPEXP_WEBKIT WXIMPORT58 #endif59 60 #else61 #define WXDLLIMPEXP_WEBKIT62 #endif // SWIG63 51 64 52 #ifndef SWIG … … 214 202 const wxString& username = wxEmptyString, 215 203 const wxString& password = wxEmptyString); 204 205 wxWebSettings GetWebSettings(); 216 206 217 207 protected: -
trunk/WebKit/wx/bindings/python/webview.i
r49908 r52668 29 29 #include "wx/wxPython/wxPython.h" 30 30 #include "wx/wxPython/pyclasses.h" 31 32 #include "WebBrowserShell.h" 31 33 #include "WebFrame.h" 34 #include "WebKitDefines.h" 35 #include "WebSettings.h" 32 36 #include "WebView.h" 33 #include "WebBrowserShell.h"34 37 %} 35 38 //--------------------------------------------------------------------------- … … 40 43 MAKE_CONST_WXSTRING(WebViewNameStr); 41 44 45 MustHaveApp(wxWebBrowserShell); 42 46 MustHaveApp(wxWebFrame); 43 47 MustHaveApp(wxWebView); 44 MustHaveApp(wxWebBrowserShell);45 48 49 %include WebKitDefines.h 50 51 %include WebBrowserShell.h 46 52 %include WebFrame.h 53 %include WebSettings.h 47 54 %include WebView.h 48 %include WebBrowserShell.h49 55 50 56 %constant wxEventType wxEVT_WEBVIEW_BEFORE_LOAD; -
trunk/WebKitTools/ChangeLog
r52667 r52668 1 2009-12-30 Kevin Watters <kevinwatters@gmail.com> 2 3 Reviewed by Kevin Ollivier. 4 5 [wx] Alter a couple of default settings in the test app. 6 7 https://bugs.webkit.org/show_bug.cgi?id=32956 8 9 * wx/browser/browser.cpp: 10 (MyApp::OnInit): 11 1 12 2009-12-30 Eric Seidel <eric@webkit.org> 2 13 -
trunk/WebKitTools/wx/browser/browser.cpp
r34152 r52668 27 27 28 28 // webkit includes 29 #include "WebBrowserShell.h" 30 #include "WebSettings.h" 29 31 #include "WebView.h" 30 #include "WebBrowserShell.h"31 32 32 33 #include "wx/wxprec.h" … … 56 57 frame->ShowDebugMenu(true); 57 58 #endif 59 60 wxWebSettings settings = frame->webview->GetWebSettings(); 61 #if __WXMSW__ || __WXMAC__ 62 settings.SetPluginsEnabled(true); 63 #endif 64 settings.SetDatabasesEnabled(true); 65 settings.SetEditableLinkBehavior(wxEditableLinkOnlyLiveWithShiftKey); 58 66 frame->CentreOnScreen(); 59 67 frame->Show(true);
Note: See TracChangeset
for help on using the changeset viewer.