Add possibility to hide and show again wxRibbonBar pages.

[wxWidgets.git] / include / wx / webview.h

diff --git a/include/wx/webview.h b/include/wx/webview.h
index 26b4040adc5f283b2d8b8cd7cd80704d7c9ea8cd..b69aa96214f0fedcb0f2692efe60109d793e2bae 100644 (file)
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -10,7 +10,7 @@
 #ifndef _WX_WEB_VIEW_H_
 #define _WX_WEB_VIEW_H_
 
 #ifndef _WX_WEB_VIEW_H_
 #define _WX_WEB_VIEW_H_
 

-#include "wx/setup.h"
+#include "wx/defs.h"

 
 #if wxUSE_WEBVIEW
 
 
 #if wxUSE_WEBVIEW
 


@@ -20,9 +20,15 @@
 #include "wx/sharedptr.h"
 #include "wx/vector.h"
 
 #include "wx/sharedptr.h"
 #include "wx/vector.h"
 

-#include "wx/osx/webviewhistoryitem_webkit.h"
-#include "wx/gtk/webviewhistoryitem_webkit.h"
-#include "wx/msw/webviewhistoryitem_ie.h"
+#if defined(__WXOSX__)
+    #include "wx/osx/webviewhistoryitem_webkit.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk/webviewhistoryitem_webkit.h"
+#elif defined(__WXMSW__)
+    #include "wx/msw/webviewhistoryitem_ie.h"
+#else
+    #error "wxWebView not implemented on this platform."
+#endif

 
 class wxFSFile;
 class wxFileSystem;
 
 class wxFSFile;
 class wxFileSystem;


@@ -59,7 +65,7 @@ enum wxWebViewReloadFlags
 {
     //Default, may access cache
     wxWEB_VIEW_RELOAD_DEFAULT,
 {
     //Default, may access cache
     wxWEB_VIEW_RELOAD_DEFAULT,

-    wxWEB_VIEW_RELOAD_NO_CACHE 
+    wxWEB_VIEW_RELOAD_NO_CACHE

 };
 
 enum wxWebViewBackend
 };
 
 enum wxWebViewBackend


@@ -219,7 +225,7 @@ typedef void (wxEvtHandler::*wxWebViewEventFunction)
     wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_LOADED, id, \
                      wxWebViewEventHandler(fn))
 
     wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_LOADED, id, \
                      wxWebViewEventHandler(fn))
 

-#define EVT_WEB_VIEW_ERRROR(id, fn) \
+#define EVT_WEB_VIEW_ERROR(id, fn) \

     wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_ERROR, id, \
                      wxWebViewEventHandler(fn))
 
     wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_ERROR, id, \
                      wxWebViewEventHandler(fn))