Commit 7231dd36 authored by jean-pierre charras's avatar jean-pierre charras

FindwxWidgets.cmake: fix missing webview library name in library list to...

FindwxWidgets.cmake: fix missing webview library name in library list to analyze. this fixes missing symbols issue in winbuilder.
parent 3c3235f4
...@@ -330,7 +330,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") ...@@ -330,7 +330,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Find wxWidgets multilib libraries. # Find wxWidgets multilib libraries.
foreach(LIB core adv aui html media xrc dbgrid gl qa richtext foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
stc ribbon propgrid) webview stc ribbon propgrid)
find_library(WX_${LIB}${_DBG} find_library(WX_${LIB}${_DBG}
NAMES NAMES
wxmsw${_UNV}31${_UCD}${_DBG}_${LIB} wxmsw${_UNV}31${_UCD}${_DBG}_${LIB}
...@@ -374,7 +374,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") ...@@ -374,7 +374,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
# Clear wxWidgets multilib libraries. # Clear wxWidgets multilib libraries.
foreach(LIB core adv aui html media xrc dbgrid gl qa richtext foreach(LIB core adv aui html media xrc dbgrid gl qa richtext
stc ribbon propgrid) webview stc ribbon propgrid)
wx_clear_lib(WX_${LIB}${_DBG}) wx_clear_lib(WX_${LIB}${_DBG})
endforeach(LIB) endforeach(LIB)
endmacro(wx_clear_all_libs) endmacro(wx_clear_all_libs)
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
#if wxUSE_STC #if wxUSE_STC
#include "wx/stc/stc.h" #include "wx/stc/stc.h"
#else #else
#error "wxStyledTextControl is needed by this sample" #error "wxStyledTextControl is needed by the web viewer"
#endif #endif
#include <dialog_shim.h> #include <dialog_shim.h>
...@@ -227,8 +227,6 @@ WEB_NAVIGATOR::WEB_NAVIGATOR( wxWindow* aParent, ...@@ -227,8 +227,6 @@ WEB_NAVIGATOR::WEB_NAVIGATOR( wxWindow* aParent,
SetMinSize( wxSize( 700, 500 ) ); SetMinSize( wxSize( 700, 500 ) );
GetSizer()->Fit( this ); GetSizer()->Fit( this );
SetSize( wxSize( 800, 600 ) );
Centre(); Centre();
} }
...@@ -268,11 +266,12 @@ void WEB_NAVIGATOR::InitNavigator( const wxString& aUrlOnStart ) ...@@ -268,11 +266,12 @@ void WEB_NAVIGATOR::InitNavigator( const wxString& aUrlOnStart )
m_info = new wxInfoBar( this ); m_info = new wxInfoBar( this );
topsizer->Add( m_info, wxSizerFlags().Expand() ); topsizer->Add( m_info, wxSizerFlags().Expand() );
// Create the webview // Create the webview engine
if( aUrlOnStart.IsEmpty() ) if( aUrlOnStart.IsEmpty() ) // Start on a blank page:
m_browser = wxWebView::New( this, wxID_ANY ); m_browser = wxWebView::New( this, wxID_ANY, wxT( "about:blank") );
else else
m_browser = wxWebView::New( this, wxID_ANY, aUrlOnStart ); m_browser = wxWebView::New( this, wxID_ANY, aUrlOnStart,
wxDefaultPosition, wxSize( 900, 600 ) );
m_browser->EnableHistory( true ); m_browser->EnableHistory( true );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment