diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
| commit | 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch) | |
| tree | 4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /WebKitTools/wx/browser | |
| parent | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff) | |
| download | external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'WebKitTools/wx/browser')
| -rw-r--r-- | WebKitTools/wx/browser/browser.bkl | 1 | ||||
| -rw-r--r-- | WebKitTools/wx/browser/browser.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/WebKitTools/wx/browser/browser.bkl b/WebKitTools/wx/browser/browser.bkl index 505d740..0a60fd9 100644 --- a/WebKitTools/wx/browser/browser.bkl +++ b/WebKitTools/wx/browser/browser.bkl @@ -47,7 +47,6 @@ wxWebKit sample application build file <exe id="wxBrowser" template="wxwk,xml2,iconv,xslt,icu,jscore,webcore,wxwebkit,curl,pthreads"> <app-type>gui</app-type> <runtime-libs>dynamic</runtime-libs> - <set var="BUILDDIR">$(WKOUTPUTDIR)/build/wxbrowser-$(FORMAT)</set> <include>$(WK_ROOT)/WebCore/platform/wx</include> <include>$(WK_ROOT)/WebCore/bridge/wx</include> diff --git a/WebKitTools/wx/browser/browser.cpp b/WebKitTools/wx/browser/browser.cpp index 5993432..83f909b 100644 --- a/WebKitTools/wx/browser/browser.cpp +++ b/WebKitTools/wx/browser/browser.cpp @@ -27,7 +27,7 @@ // webkit includes #include "WebView.h" -#include "WebFrame.h" +#include "WebBrowserShell.h" #include "wx/wxprec.h" #ifndef WX_PRECOMP @@ -50,7 +50,7 @@ bool MyApp::OnInit() // create the main application window // see WebKit/wx/WebFrame.cpp for how to write a shell around wxWebView. - wxWebFrame *frame = new wxWebFrame(_T("wxWebKit Test App")); + wxWebBrowserShell *frame = new wxWebBrowserShell(_T("wxWebKit Test App")); #ifndef NDEBUG frame->ShowDebugMenu(true); |