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

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

CMakeModules/FindwxWidgets.cmake

+2 −2
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") 


    # Find wxWidgets multilib libraries.

    foreach(LIB core adv aui html media xrc dbgrid gl qa richtext

                stc ribbon propgrid)

                webview stc ribbon propgrid)

      find_library(WX_${LIB}${_DBG}

        NAMES

        wxmsw${_UNV}31${_UCD}${_DBG}_${LIB}
@@ -374,7 +374,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32") 


    # Clear wxWidgets multilib libraries.

    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})

    endforeach(LIB)

  endmacro(wx_clear_all_libs)

webviewer/webviewer.cpp

+6 −7
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#if wxUSE_STC

#include "wx/stc/stc.h"

#else

#error "wxStyledTextControl is needed by this sample"

#error "wxStyledTextControl is needed by the web viewer"

#endif



#include <dialog_shim.h>
@@ -227,8 +227,6 @@ WEB_NAVIGATOR::WEB_NAVIGATOR( wxWindow* aParent, 
    SetMinSize( wxSize( 700, 500 ) );



    GetSizer()->Fit( this );



    SetSize( wxSize( 800, 600 ) );

    Centre();

}
@@ -268,11 +266,12 @@ void WEB_NAVIGATOR::InitNavigator( const wxString& aUrlOnStart ) 
    m_info = new wxInfoBar( this );

    topsizer->Add( m_info, wxSizerFlags().Expand() );



    // Create the webview

    if( aUrlOnStart.IsEmpty() )

        m_browser = wxWebView::New( this, wxID_ANY );

    // Create the webview engine

    if( aUrlOnStart.IsEmpty() )     // Start on a blank page:

        m_browser = wxWebView::New( this, wxID_ANY, wxT( "about:blank")  );

    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 );