Various typos fixes and minor build system changes. After a rebake wxMSW should now...

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 314f294c82d9520f160e5310ae66364efcdcc9e4..774cbaf26d28db83c30f3625755741906b35865c 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3340,7 +3340,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="WEB_SRC_PLATFORM">
-    <if cond="TOOLKIT=='MSW'">src/msw/webview.cpp</if>
+    <if cond="TOOLKIT=='MSW'">src/msw/webviewie.cpp</if>
     <if cond="PLATFORM_UNIX=='1'">src/gtk/webview.cpp</if>
     <if cond="PLATFORM_MACOSX=='1'">src/osx/webview.mm</if>
 </set>

diff --git a/build/bakefiles/multilib.bkl b/build/bakefiles/multilib.bkl
index 6c5ffd7c7f360c722fa0b829853ca444b2409495..748bf64c7c6a4fed7bf946bf9363394af2a7ec6d 100644 (file)
--- a/build/bakefiles/multilib.bkl
+++ b/build/bakefiles/multilib.bkl
@@ -184,15 +184,9 @@
         <sources>$(WEB_SRC)</sources>
         <library>coredll</library>
         <library>basedll</library>
-        <ldlibs>$(EXTRALIBS_WEB)</ldlibs>
         <msvc-headers>$(WEB_HDR)</msvc-headers>
     </dll>
 
-    <!-- use this to conditonally link against htmldll with <library>: -->
-    <set var="webdll_library_link">
-        <if cond="SHARED=='1' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">webdll</if>
-    </set>
-
     <lib id="weblib" template="wx_lib"
          cond="SHARED=='0' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">
         <sources>$(WEB_SRC)</sources>

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index d04413352d3701c687482a9df420e01697c40ea1..0cdf3a45d6416242aa135f5b517f2fd28b4ea7ff 100644 (file)
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -52,7 +52,6 @@ EXTRALIBS = {
     'html' : '$(EXTRALIBS_HTML)',
     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
     'media' : '$(EXTRALIBS_MEDIA)',
-    'web' : '$(EXTRALIBS_WEB)',
 }
 
 def mkLibName(wxid):

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 13231ed6fd33e746cbc070f566291e03e3204bc2..5d6c9e72a0e2a873b947242888dfb73a3a12906f 100644 (file)
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -91,6 +91,7 @@
 #    define WXMAKINGDLL_RICHTEXT
 #    define WXMAKINGDLL_MEDIA
 #    define WXMAKINGDLL_STC
+#    define WXMAKINGDLL_WEB
 #endif /* WXMAKINGDLL */
 
 /*
@@ -263,6 +264,14 @@
 #    define WXDLLIMPEXP_DATA_STC(type) type
 #endif
 
+#ifdef WXMAKINGDLL_WEB
+#    define WXDLLIMPEXP_WEB WXEXPORT
+#elif defined(WXUSINGDLL)
+#    define WXDLLIMPEXP_WEB WXIMPORT
+#else /* not making nor using DLL */
+#    define WXDLLIMPEXP_WEB
+#endif
+
 /*
    GCC warns about using __attribute__ (and also __declspec in mingw32 case) on
    forward declarations while MSVC complains about forward declarations without
@@ -284,6 +293,7 @@
     #define WXDLLIMPEXP_FWD_RICHTEXT
     #define WXDLLIMPEXP_FWD_MEDIA
     #define WXDLLIMPEXP_FWD_STC
+    #define WXDLLIMPEXP_FWD_WEB
 #else
     #define WXDLLIMPEXP_FWD_BASE      WXDLLIMPEXP_BASE
     #define WXDLLIMPEXP_FWD_NET       WXDLLIMPEXP_NET
@@ -299,6 +309,7 @@
     #define WXDLLIMPEXP_FWD_RICHTEXT  WXDLLIMPEXP_RICHTEXT
     #define WXDLLIMPEXP_FWD_MEDIA     WXDLLIMPEXP_MEDIA
     #define WXDLLIMPEXP_FWD_STC       WXDLLIMPEXP_STC
+    #define WXDLLIMPEXP_FWD_WEB       WXDLLIMPEXP_WEB
 #endif
 
 /* for backwards compatibility, define suffix-less versions too */

diff --git a/include/wx/gtk/webview.h b/include/wx/gtk/webview.h
index 6d098709403a08582d765148513e122cc1c26efd..d2fbb7cf9eb7e452f1df47ae6c0417aab11a64c1 100644 (file)
--- a/include/wx/gtk/webview.h
+++ b/include/wx/gtk/webview.h
@@ -114,3 +114,4 @@ private:
 
 #endif // if wxHAVE_WEB_BACKEND_GTK_WEBKIT
 
+#endif

diff --git a/include/wx/webview.h b/include/wx/webview.h
index 9dbefdc9c6eb2d25a5d05cc8b7256133cae0c49d..5ec90460d851c3f825d64352ce761eed984b7290 100644 (file)
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -63,8 +63,10 @@ enum wxWebNavigationError
 /** Type of refresh */
 enum wxWebViewReloadFlags
 {
-  /** Reload the current view without accessing the cache */
-  wxWEB_VIEW_RELOAD_NO_CACHE = 1
+    /** Default reload, will access cache */
+    wxWEB_VIEW_RELOAD_DEFAULT = 0,
+    /** Reload the current view without accessing the cache */
+    wxWEB_VIEW_RELOAD_NO_CACHE = 1
 };
 
 
@@ -216,7 +218,7 @@ public:
      * Reload the currently displayed URL.
      * @param flags A bit array that may optionnally contain reload options
      */
-    virtual void Reload(wxWebViewReloadFlags flags=0) = 0;
+    virtual void Reload(wxWebViewReloadFlags flags = wxWEB_VIEW_RELOAD_DEFAULT) = 0;
 
 
     /**
@@ -411,19 +413,19 @@ typedef void (wxEvtHandler::*wxWebNavigationEventFunction)
     wxEVENT_HANDLER_CAST(wxWebNavigationEventFunction, func)
 
 #define EVT_WEB_VIEW_NAVIGATING(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATING, id,
+    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATING, id, \
                      wxHtmlNavigatingEventHandler(fn))
 
 #define EVT_WEB_VIEW_NAVIGATED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, id,
+    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_NAVIGATED, id, \
                      wxHtmlNavigatingEventHandler(fn))
 
 #define EVT_WEB_VIEW_LOADED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_LOADED, id,
+    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_LOADED, id, \
                      wxHtmlNavigatingEventHandler(fn))
 
 #define EVT_WEB_VIEW_ERRROR(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_ERROR, id,
+    wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_ERROR, id, \
                      wxHtmlNavigatingEventHandler(fn))
 
 #endif

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 61101864275380ea1ba7ee7b6ad35c241cb5d7f4..3763b1b31c51c95a6c15683933d154f482699c72 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -7,11 +7,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
 #include "wx/webview.h"
 
-#include "wx/osx/webkit.h"
-#include "wx/gtk/webkit.h"
-#include "wx/msw/webkitie.h"
+#include "wx/osx/webview.h"
+#include "wx/gtk/webview.h"
+#include "wx/msw/webviewie.h"
 
 extern WXDLLEXPORT_DATA(const char) wxWebViewNameStr[] = "wxWebView";
 extern WXDLLEXPORT_DATA(const char) wxWebViewDefaultURLStr[] = "about:blank";

diff --git a/src/msw/webviewie.cpp b/src/msw/webviewie.cpp
index fe302da0fcc697a85b818fbfb3124d6ad012dde3..3c810407f52f80c8ed6e6a3756b41982d75ab895 100644 (file)
--- a/src/msw/webviewie.cpp
+++ b/src/msw/webviewie.cpp
@@ -7,7 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/msw/webview.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if defined(__BORLANDC__)
+    #pragma hdrstop
+#endif
+
+#include "wx/msw/webviewie.h"
 
 #if wxHAVE_WEB_BACKEND_IE