X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/853b6cd0e4699dbec2c600d9d0390bdb53150a5f..152a58083fbe9ad9ff15f41472e0a2fdf9f73fb3:/src/msw/webview_ie.cpp diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp index d51a3e7f41..29b0361f4d 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -16,7 +16,7 @@ #include "wx/msw/webview_ie.h" -#if wxHAVE_WEB_BACKEND_IE +#if wxUSE_WEBVIEW_IE #include #include @@ -24,20 +24,19 @@ #include #include +// Various definitions are missing from mingw #ifdef __MINGW32__ -// FIXME: Seems like MINGW does not have these, how to handle cleanly? -#define DISPID_COMMANDSTATECHANGE 105 typedef enum CommandStateChangeConstants { CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF, CSC_NAVIGATEFORWARD = 0x1, CSC_NAVIGATEBACK = 0x2 } CommandStateChangeConstants; - -// FIXME: Seems like MINGW does not have these, how to handle cleanly? -#define DISPID_NAVIGATECOMPLETE2 252 -#define DISPID_NAVIGATEERROR 271 -#define OLECMDID_OPTICAL_ZOOM 63 +#define DISPID_COMMANDSTATECHANGE 105 +#define DISPID_NAVIGATECOMPLETE2 252 +#define DISPID_NAVIGATEERROR 271 +#define DISPID_NEWWINDOW3 273 +#define OLECMDID_OPTICAL_ZOOM 63 #define INET_E_ERROR_FIRST 0x800C0002L #define INET_E_INVALID_URL 0x800C0002L #define INET_E_NO_SESSION 0x800C0003L @@ -67,6 +66,7 @@ typedef enum CommandStateChangeConstants { #define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L #define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L +#define REFRESH_NORMAL 0 #define REFRESH_COMPLETELY 3 #endif @@ -112,6 +112,7 @@ bool wxWebViewIE::Create(wxWindow* parent, SetBackgroundStyle(wxBG_STYLE_PAINT); SetDoubleBuffered(true); + LoadUrl(url); return true; }