Minor fixes to allow web sample to compile

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/web/web.bkl b/samples/web/web.bkl
index 02b5bce266d0351f97704932a967c51dd0dbe59c..9c7fe77d9c7af4e558254334f1983ef35b3caca0 100644 (file)
--- a/samples/web/web.bkl
+++ b/samples/web/web.bkl
@@ -14,6 +14,10 @@
         <wx-lib>web</wx-lib>\r
         <wx-lib>stc</wx-lib>\r
         <win32-res>../sample.rc</win32-res>\r
+               \r
+               <if cond="OUT_OF_TREE_MAKEFILES=='0'">\r
+            <sys-lib>$(LIB_SCINTILLA)</sys-lib>\r
+        </if>\r
     </exe>\r
 \r
 </makefile>\r

diff --git a/samples/web/web.cpp b/samples/web/web.cpp
index b5ad05da5e1ac1a60956bd23663d6af2559eac16..c22ebaa6e110da10b340701161ace6151c69c3a2 100644 (file)
--- a/samples/web/web.cpp
+++ b/samples/web/web.cpp
@@ -585,7 +585,7 @@ bool wxMiniApp::OnInit()
                    wxCommandEventHandler(wxMiniApp::onSetZoom),  NULL, this );
 
     // ---- Create the web view
-    m_browser_ctrl = wxWebView::GetNew(mainpane, wxID_ANY);
+    m_browser_ctrl = wxWebView::New(mainpane, wxID_ANY);
     
     // ---- Create the notification panel
     {