AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

A few more build fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton 2011-05-05 18:48:07 +00:00
parent 384b8d9f3d
commit 3544f421d8
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.in
View File

@ -843,6 +843,7 @@ WX_ARG_FEATURE(richtext, [ --enable-richtext use wxRichTextCtrl], wxUS
WX_ARG_FEATURE(postscript, [ --enable-postscript use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT) WX_ARG_FEATURE(postscript, [ --enable-postscript use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
WX_ARG_FEATURE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE) WX_ARG_FEATURE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
WX_ARG_FEATURE(svg, [ --enable-svg use wxSVGFileDC device context], wxUSE_SVG) WX_ARG_FEATURE(svg, [ --enable-svg use wxSVGFileDC device context], wxUSE_SVG)
WX_ARG_FEATURE(web, [ --enable-web use wxWeb library], wxUSE_WEB)
dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter
dnl can't be disabled, don't even provide an option to do it dnl can't be disabled, don't even provide an option to do it
@ -7340,6 +7341,13 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
fi fi
USE_WEB=0
if test "$wxUSE_WEB" = "yes"; then
AC_DEFINE(wxUSE_WEB)
USE_WEB=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web"
fi
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl wxImage options dnl wxImage options
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@ -7722,6 +7730,10 @@ if test "$wxUSE_GUI" = "yes"; then
if test "$wxUSE_STC" = "yes" ; then if test "$wxUSE_STC" = "yes" ; then
BUILT_WX_LIBS="stc $BUILT_WX_LIBS" BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
fi fi
if test "$wxUSE_WEB" = "yes" ; then
STD_GUI_LIBS="web $STD_GUI_LIBS"
BUILT_WX_LIBS="web $BUILT_WX_LIBS"
fi
if test "$wxUSE_XRC" = "yes" ; then if test "$wxUSE_XRC" = "yes" ; then
STD_GUI_LIBS="xrc $STD_GUI_LIBS" STD_GUI_LIBS="xrc $STD_GUI_LIBS"
BUILT_WX_LIBS="xrc $BUILT_WX_LIBS" BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"

3
include/msvc/wx/setup.h
View File

@ -187,6 +187,9 @@
#pragma comment(lib, wxMSW_LIB_NAME("stc")) #pragma comment(lib, wxMSW_LIB_NAME("stc"))
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla")) #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
#endif #endif
#if wxUSE_WEB && !defined(wxNO_WEB_LIB)
#pragma comment(lib, wxMSW_LIB_NAME("web"))
#endif
#endif // wxUSE_GUI #endif // wxUSE_GUI

7
include/wx/setup_inc.h
View File

@ -703,6 +703,13 @@
// Recommended setting: 1 // Recommended setting: 1
#define wxUSE_STC 1 #define wxUSE_STC 1
// Use wxWidget's web viewing classes
//
// Default is 1
//
// Recommended setting: 1
#define wxUSE_WEB 1
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
// 2D drawing API. (Still somewhat experimental) // 2D drawing API. (Still somewhat experimental)

4
src/common/webview.cpp
View File

@ -20,6 +20,10 @@
#include "wx/gtk/webview.h" #include "wx/gtk/webview.h"
#include "wx/msw/webviewie.h" #include "wx/msw/webviewie.h"
// DLL options compatibility check:
#include "wx/app.h"
WX_CHECK_BUILD_OPTIONS("wxWEB")
extern WXDLLEXPORT_DATA(const char) wxWebViewNameStr[] = "wxWebView"; extern WXDLLEXPORT_DATA(const char) wxWebViewNameStr[] = "wxWebView";
extern WXDLLEXPORT_DATA(const char) wxWebViewDefaultURLStr[] = "about:blank"; extern WXDLLEXPORT_DATA(const char) wxWebViewDefaultURLStr[] = "about:blank";