Enable IE backend in msw builds unconditionally until the backend flags work properly...

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

diff --git a/include/wx/msw/webviewie.h b/include/wx/msw/webviewie.h
index aa2ab97d56e12dc3a5b76a36e91d96a9b426e5ef..c0f7a427d18d304b7df7a68b37daec065f48d048 100644 (file)
--- a/include/wx/msw/webviewie.h
+++ b/include/wx/msw/webviewie.h
@@ -12,6 +12,10 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

+#ifdef __WXMSW__
+    #define wxHAVE_WEB_BACKEND_IE 1
+#endif
+

 #if wxHAVE_WEB_BACKEND_IE
 
 #include "wx/control.h"
 #if wxHAVE_WEB_BACKEND_IE
 
 #include "wx/control.h"

diff --git a/include/wx/webview.h b/include/wx/webview.h
index 2031531e412909a0a421c1db2f5c9f19d80b8dc4..4cd6c89b2e4baec14dad47857298a3548d64b658 100644 (file)
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -345,15 +345,7 @@ public:
     virtual bool IsBusy() = 0;
 };
 
     virtual bool IsBusy() = 0;
 };
 

-//class WXDLLIMPEXP_FWD_HTML wxWebNavigationEvent;
-
-// FIXME: get those WXDLLIMPEXP_HTML & DECLARE_DYNAMIC_CLASS right...
-//wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_HTML, wxEVT_COMMAND_WEB_VIEW_NAVIGATE,
-//                         wxWebNavigationEvent );
-
-
-// FIXME: get those WXDLLIMPEXP_HTML & DECLARE_DYNAMIC_CLASS right...
-class wxWebNavigationEvent : public wxCommandEvent
+class WXDLLIMPEXP_WEB wxWebNavigationEvent : public wxCommandEvent

 {
 public:
     wxWebNavigationEvent() {}
 {
 public:
     wxWebNavigationEvent() {}

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index a5c87b02190c2a8c36e801bb1d4c842297eba8af..9d710449fe5ceec70ee8db9bcd5c74b97b12b9b2 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -53,7 +53,7 @@ wxWebView* wxWebView::New(wxWebViewBackend backend)
 
         #if wxHAVE_WEB_BACKEND_IE
             case wxWEB_VIEW_BACKEND_IE:
 
         #if wxHAVE_WEB_BACKEND_IE
             case wxWEB_VIEW_BACKEND_IE:

-                return new wxIEPanel();
+                return new wxWebViewIE();

         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:


@@ -67,7 +67,7 @@ wxWebView* wxWebView::New(wxWebViewBackend backend)
             #endif
 
             #if wxHAVE_WEB_BACKEND_IE
             #endif
 
             #if wxHAVE_WEB_BACKEND_IE

-            return new wxIEPanel();
+            return new wxWebViewIE();

             #endif
 
         // fall-through intended
             #endif
 
         // fall-through intended


@@ -102,7 +102,7 @@ wxWebView* wxWebView::New(wxWindow* parent,
 
         #if wxHAVE_WEB_BACKEND_IE
             case wxWEB_VIEW_BACKEND_IE:
 
         #if wxHAVE_WEB_BACKEND_IE
             case wxWEB_VIEW_BACKEND_IE:

-                return new wxIEPanel(parent, id, url, pos, size, style, name);
+                return new wxWebViewIE(parent, id, url, pos, size, style, name);

         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:
         #endif
 
         case wxWEB_VIEW_BACKEND_DEFAULT:


@@ -116,7 +116,7 @@ wxWebView* wxWebView::New(wxWindow* parent,
             #endif
 
             #if wxHAVE_WEB_BACKEND_IE
             #endif
 
             #if wxHAVE_WEB_BACKEND_IE

-            return new wxIEPanel(parent, id, url, pos, size, style, name);
+            return new wxWebViewIE(parent, id, url, pos, size, style, name);

             #endif
 
         // fall-through intended
             #endif
 
         // fall-through intended

diff --git a/src/msw/webviewie.cpp b/src/msw/webviewie.cpp
index 3c810407f52f80c8ed6e6a3756b41982d75ab895..4b7dabe02b589c7774a26df369d4c4b2d0e6d61d 100644 (file)
--- a/src/msw/webviewie.cpp
+++ b/src/msw/webviewie.cpp
@@ -24,6 +24,7 @@
 #include <exdisp.h>
 #include <mshtml.h>
 
 #include <exdisp.h>
 #include <mshtml.h>
 

+#ifdef __MINGW32__

 // FIXME: Seems like MINGW does not have these, how to handle cleanly?
 #define DISPID_COMMANDSTATECHANGE   105
 typedef enum CommandStateChangeConstants {
 // FIXME: Seems like MINGW does not have these, how to handle cleanly?
 #define DISPID_COMMANDSTATECHANGE   105
 typedef enum CommandStateChangeConstants {


@@ -67,10 +68,11 @@ typedef enum CommandStateChangeConstants {
 #define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
 
 #define REFRESH_COMPLETELY 3
 #define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
 
 #define REFRESH_COMPLETELY 3

+#endif

 
 BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)
 
 BEGIN_EVENT_TABLE(wxWebViewIE, wxControl)

-EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
-EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg)
+    EVT_ACTIVEX(wxID_ANY, wxWebViewIE::onActiveXEvent)
+    EVT_ERASE_BACKGROUND(wxWebViewIE::onEraseBg)

 END_EVENT_TABLE()
 
 bool wxWebViewIE::Create(wxWindow* parent,
 END_EVENT_TABLE()
 
 bool wxWebViewIE::Create(wxWindow* parent,