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

Enable IE backend in msw builds unconditionally until the backend flags work properly. Conditionally define INET constants only under mingw as it does not apparently provide them. Fix some typos. The sample now compiles under msw.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@67712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton 2011-05-06 15:28:19 +00:00
parent a703012aed
commit 97ad1425fe
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/webviewie.h
View File

@ -12,6 +12,10 @@
#include "wx/setup.h"
#ifdef __WXMSW__
#define wxHAVE_WEB_BACKEND_IE 1
#endif
#if wxHAVE_WEB_BACKEND_IE
#include "wx/control.h"

10
include/wx/webview.h
View File

@ -345,15 +345,7 @@ public:
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() {}

8
src/common/webview.cpp
View File

@ -53,7 +53,7 @@ wxWebView* wxWebView::New(wxWebViewBackend backend)
#if wxHAVE_WEB_BACKEND_IE
case wxWEB_VIEW_BACKEND_IE:
return new wxIEPanel();
return new wxWebViewIE();
#endif
case wxWEB_VIEW_BACKEND_DEFAULT:
@ -67,7 +67,7 @@ wxWebView* wxWebView::New(wxWebViewBackend backend)
#endif
#if wxHAVE_WEB_BACKEND_IE
return new wxIEPanel();
return new wxWebViewIE();
#endif
// fall-through intended
@ -102,7 +102,7 @@ wxWebView* wxWebView::New(wxWindow* parent,
#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:
@ -116,7 +116,7 @@ wxWebView* wxWebView::New(wxWindow* parent,
#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

6
src/msw/webviewie.cpp
View File

@ -24,6 +24,7 @@
#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 {
@ -67,10 +68,11 @@ typedef enum CommandStateChangeConstants {
#define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
#define REFRESH_COMPLETELY 3
#endif
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,