A few more build fixes

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

diff --git a/configure.in b/configure.in
index f5492aaefb531ac7c5d11f4b1cf92fbd4fa14e39..d30a5a91b3fa1c560e9aff8422d0dfa3c7764104 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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(printarch,   [  --enable-printarch      use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
 WX_ARG_FEATURE(svg,         [  --enable-svg            use wxSVGFileDC device context], wxUSE_SVG)
 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(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 can't be disabled, don't even provide an option to do it
 
 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


@@ -7340,6 +7341,13 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 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 wxImage options
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl wxImage options
 dnl ---------------------------------------------------------------------------


@@ -7722,6 +7730,10 @@ if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_STC" = "yes" ; then
         BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
     fi
     if test "$wxUSE_STC" = "yes" ; then
         BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
     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
         STD_GUI_LIBS="xrc $STD_GUI_LIBS"
         BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"
     if test "$wxUSE_XRC" = "yes" ; then
         STD_GUI_LIBS="xrc $STD_GUI_LIBS"
         BUILT_WX_LIBS="xrc $BUILT_WX_LIBS"

diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h
index 99362ff09a7a92f117c4482c1d3168e086213d9e..796e97d7c614a5f8a3a2c393a516fa6ef636f340 100644 (file)
--- a/include/msvc/wx/setup.h
+++ b/include/msvc/wx/setup.h
@@ -187,6 +187,9 @@
         #pragma comment(lib, wxMSW_LIB_NAME("stc"))
         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
     #endif
         #pragma comment(lib, wxMSW_LIB_NAME("stc"))
         #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
     #endif

+    #if wxUSE_WEB && !defined(wxNO_WEB_LIB)
+        #pragma comment(lib, wxMSW_LIB_NAME("web"))
+    #endif

 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI
 
 

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 66cb3e25d89d3f8fc0a94c409cab20c1615b3990..4bee0c25bda3eafbf52c515ae77be11170109daf 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -703,6 +703,13 @@
 // Recommended setting: 1
 #define wxUSE_STC 1
 
 // Recommended setting: 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
 // 2D drawing API.  (Still somewhat experimental)
 
 // Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
 // 2D drawing API.  (Still somewhat experimental)

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 3763b1b31c51c95a6c15683933d154f482699c72..492745a6b85fedfce0080cbcba9a2a74c079a180 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -20,6 +20,10 @@
 #include "wx/gtk/webview.h"
 #include "wx/msw/webviewie.h"
 
 #include "wx/gtk/webview.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) wxWebViewDefaultURLStr[] = "about:blank";
 
 extern WXDLLEXPORT_DATA(const char) wxWebViewNameStr[] = "wxWebView";
 extern WXDLLEXPORT_DATA(const char) wxWebViewDefaultURLStr[] = "about:blank";