dwindows: win/edge.cpp annotate

annotate win/edge.cpp @ 2044:b74b9afa31aa

Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. When the size event is handled, check that the widget is visible, if not set it.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Mon, 25 Nov 2019 03:16:45 +0000
parents	82e5c998df2e
children	cb195d76de8e

rev	line source
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	1 /* edge.cpp
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	2 *
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	3 * Allows dw_html_new() to embed a Microsoft Edge (Chromium) browser.
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	4 *
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	5 * Requires Windows 10, 8 or 7 with Microsoft Edge (Chromium) installed.
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	6 *
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	7 * Only included when BUILD_EDGE is defined, will fall back to embedded IE.
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	8 *
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	9 * Currently only buildable with Visual Studio since it requires the EDGE
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	10 * SDK which is currently distributed as a nuget package.
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	11 */
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	12 #include "dw.h"
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	13 #include "webview2.h"
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	14 #include <wrl.h>
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	15
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	16 using namespace Microsoft::WRL;
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	17
2034 89d62197124b Visual C in C++ mode complains about missing const declarations in paramaters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2033 diff changeset	18 #define _DW_HTML_DATA_NAME "_dw_edge"
89d62197124b Visual C in C++ mode complains about missing const declarations in paramaters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2033 diff changeset	19 #define _DW_HTML_DATA_LOCATION "_dw_edge_location"
89d62197124b Visual C in C++ mode complains about missing const declarations in paramaters. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2033 diff changeset	20 #define _DW_HTML_DATA_RAW "_dw_edge_raw"
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	21
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	22 extern "C" {
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	23
2018 663d79f28e46 Win: Fix dw_html_javascript_run() when using embedded IE browser widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2015 diff changeset	24 /* Import the character conversion functions from dw.c */
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	25 LPWSTR _myUTF8toWide(const char* utf8string, void* outbuf);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	26 char* _myWideToUTF8(LPCWSTR widestring, void* outbuf);
2018 663d79f28e46 Win: Fix dw_html_javascript_run() when using embedded IE browser widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2015 diff changeset	27 #define UTF8toWide(a) _myUTF8toWide(a, a ? _alloca(MultiByteToWideChar(CP_UTF8, 0, a, -1, NULL, 0) * sizeof(WCHAR)) : NULL)
663d79f28e46 Win: Fix dw_html_javascript_run() when using embedded IE browser widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2015 diff changeset	28 #define WideToUTF8(a) _myWideToUTF8(a, a ? _alloca(WideCharToMultiByte(CP_UTF8, 0, a, -1, NULL, 0, NULL, NULL)) : NULL)
663d79f28e46 Win: Fix dw_html_javascript_run() when using embedded IE browser widget. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2015 diff changeset	29 LRESULT CALLBACK _wndproc(HWND hWnd, UINT msg, WPARAM mp1, LPARAM mp2);
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	30 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	31
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	32 class EdgeBrowser
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	33 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	34 public:
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	35 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	36 BOOL Detect(VOID);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	37 protected:
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	38 Microsoft::WRL::ComPtr<IWebView2Environment> Env;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	39 };
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	40
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	41 class EdgeWebView
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	42 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	43 public:
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	44 VOID Action(int action);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	45 int Raw(const char* string);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	46 int URL(const char* url);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	47 int JavascriptRun(const char* script, void* scriptdata);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	48 VOID DoSize(VOID);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	49 VOID Setup(HWND hwnd, IWebView2WebView* webview);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	50 VOID Close(VOID);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	51 protected:
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	52 HWND hWnd = nullptr;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	53 Microsoft::WRL::ComPtr<IWebView2WebView> WebView;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	54 };
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	55
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	56 LRESULT CALLBACK EdgeBrowser::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	57 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	58 switch (uMsg)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	59 {
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	60 case WM_SIZE:
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	61 {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	62 // Resize the browser object to fit the window
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	63 EdgeWebView *webview;
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	64
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	65 // Retrieve the browser object's pointer we stored in our window's GWL_USERDATA when
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	66 // we initially attached the browser object to this window.
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	67 webview = (EdgeWebView*)dw_window_get_data(hWnd, _DW_HTML_DATA_NAME);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	68 // Resize WebView to fit the bounds of the parent window
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	69 if (webview)
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	70 webview->DoSize();
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	71 return(0);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	72 }
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	73
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	74 case WM_PAINT:
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	75 {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	76 PAINTSTRUCT ps;
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	77 HDC hdc = BeginPaint(hWnd, &ps);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	78 EndPaint(hWnd, &ps);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	79 return(0);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	80 }
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	81
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	82 case WM_CREATE:
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	83 {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	84 // Step 3 - Create a single WebView within the parent window
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	85 // Create a WebView, whose parent is the main window hWnd
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	86 Env->CreateWebView(hWnd, Callback<IWebView2CreateWebViewCompletedHandler>(
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	87 [hWnd](HRESULT result, IWebView2WebView* webview) -> HRESULT {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	88 EdgeWebView* WebView = new EdgeWebView;
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	89
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	90 WebView->Setup(hWnd, webview);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	91 dw_window_set_data(hWnd, _DW_HTML_DATA_NAME, DW_POINTER(WebView));
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	92
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	93 // Add a few settings for the webview
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	94 // this is a redundant demo step as they are the default settings values
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	95 IWebView2Settings* Settings;
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	96 webview->get_Settings(&Settings);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	97 Settings->put_IsScriptEnabled(TRUE);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	98 Settings->put_AreDefaultScriptDialogsEnabled(TRUE);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	99 Settings->put_IsWebMessageEnabled(TRUE);
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	100
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	101 // Resize WebView to fit the bounds of the parent window
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	102 WebView->DoSize();
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	103
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	104 // Save the token, we might need to dw_window_set_data() this value
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	105 // for later use to remove the handlers
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	106 EventRegistrationToken token;
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	107
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	108 // Register a handler for the NavigationStarting event.
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	109 webview->add_NavigationStarting(
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	110 Callback<IWebView2NavigationStartingEventHandler>(
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	111 [hWnd](IWebView2WebView* sender,
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	112 IWebView2NavigationStartingEventArgs* args) -> HRESULT
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	113 {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	114 LPWSTR uri;
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	115 sender->get_Source(&uri);
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	116
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	117 _wndproc(hWnd, WM_USER + 101, (WPARAM)DW_INT_TO_POINTER(DW_HTML_CHANGE_STARTED),
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	118 !wcscmp(uri, L"about:blank") ? (LPARAM)"" : (LPARAM)WideToUTF8((LPWSTR)uri));
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	119
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	120 return S_OK;
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	121 }).Get(), &token);
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	122
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	123 // Register a handler for the DocumentStateChanged event.
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	124 webview->add_DocumentStateChanged(
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	125 Callback<IWebView2DocumentStateChangedEventHandler>(
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	126 [hWnd](IWebView2WebView* sender,
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	127 IWebView2DocumentStateChangedEventArgs* args) -> HRESULT
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	128 {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	129 LPWSTR uri;
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	130 sender->get_Source(&uri);
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	131
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	132 _wndproc(hWnd, WM_USER + 101, (WPARAM)DW_INT_TO_POINTER(DW_HTML_CHANGE_LOADING),
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	133 !wcscmp(uri, L"about:blank") ? (LPARAM)"" : (LPARAM)WideToUTF8((LPWSTR)uri));
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	134
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	135 return S_OK;
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	136 }).Get(), &token);
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	137
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	138 // Register a handler for the NavigationCompleted event.
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	139 webview->add_NavigationCompleted(
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	140 Callback<IWebView2NavigationCompletedEventHandler>(
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	141 [hWnd](IWebView2WebView* sender,
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	142 IWebView2NavigationCompletedEventArgs* args) -> HRESULT
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	143 {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	144 LPWSTR uri;
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	145 sender->get_Source(&uri);
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	146
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	147 _wndproc(hWnd, WM_USER + 101, (WPARAM)DW_INT_TO_POINTER(DW_HTML_CHANGE_COMPLETE),
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	148 !wcscmp(uri, L"about:blank") ? (LPARAM)"" : (LPARAM)WideToUTF8((LPWSTR)uri));
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	149
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	150 return S_OK;
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	151 }).Get(), &token);
2001 f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	152
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	153 // Handle cached load requests due to delayed
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	154 // loading of the edge webview contexts
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	155 char url = (char )dw_window_get_data(hWnd, _DW_HTML_DATA_LOCATION);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	156 if (url)
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	157 {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	158 WebView->URL(url);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	159 free((void*)url);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	160 }
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	161 char raw = (char )dw_window_get_data(hWnd, _DW_HTML_DATA_RAW);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	162 if (raw)
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	163 {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	164 WebView->Raw(raw);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	165 free((void*)raw);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	166 }
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	167 return S_OK;
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	168 }).Get());
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	169 // Success
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	170 return(0);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	171 }
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	172
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	173 case WM_DESTROY:
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	174 {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	175 // Detach the browser object from this window, and free resources.
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	176 EdgeWebView *webview;
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	177
2043 82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	178 // Retrieve the browser object's pointer we stored in our window's GWL_USERDATA when
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	179 // we initially attached the browser object to this window.
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	180 webview = (EdgeWebView*)dw_window_get_data(hWnd, _DW_HTML_DATA_NAME);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	181 if (webview)
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	182 {
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	183 dw_window_set_data(hWnd, _DW_HTML_DATA_NAME, NULL);
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	184 webview->Close();
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	185 delete webview;
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	186 }
82e5c998df2e Win: Fix crash on Edge HTML widget destruction. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2042 diff changeset	187 return(TRUE);
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	188 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	189 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	190
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	191 return(DefWindowProc(hWnd, uMsg, wParam, lParam));
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	192 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	193
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	194 VOID EdgeWebView::DoSize(VOID)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	195 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	196 RECT bounds;
2044 b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	197 BOOL isVisible;
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	198
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	199 GetClientRect(hWnd, &bounds);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	200 WebView->put_Bounds(bounds);
2044 b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	201 WebView->get_IsVisible(&isVisible);
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	202 if(!isVisible)
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	203 WebView->put_IsVisible(TRUE);
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	204 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	205
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	206 BOOL EdgeBrowser::Detect(VOID)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	207 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	208 CreateWebView2EnvironmentWithDetails(nullptr, nullptr, nullptr,
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	209 Callback<IWebView2CreateWebView2EnvironmentCompletedHandler>(
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	210 [this](HRESULT result, IWebView2Environment* env) -> HRESULT {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	211 // Successfully created Edge environment, return TRUE
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	212 Env = env;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	213 return S_OK;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	214 }).Get());
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	215 return Env ? TRUE : FALSE;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	216 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	217
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	218 void EdgeWebView::Action(int action)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	219 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	220 // We want to get the base address (ie, a pointer) to the IWebView2WebView object embedded within the browser
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	221 // object, so we can call some of the functions in the former's table.
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	222 if (WebView)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	223 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	224 // Call the desired function
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	225 switch (action)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	226 {
2044 b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	227 case DW_HTML_GOBACK:
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	228 {
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	229 // Call the IWebView2WebView object's GoBack function.
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	230 WebView->GoBack();
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	231 break;
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	232 }
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	233
2044 b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	234 case DW_HTML_GOFORWARD:
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	235 {
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	236 // Call the IWebView2WebView object's GoForward function.
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	237 WebView->GoForward();
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	238 break;
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	239 }
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	240
2044 b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	241 case DW_HTML_GOHOME:
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	242 {
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	243 // Call the IWebView2WebView object's GoHome function.
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	244 dw_html_url(hWnd, (char*)DW_HOME_URL);
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	245 break;
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	246 }
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	247
2044 b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	248 case DW_HTML_SEARCH:
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	249 {
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	250 // Call the IWebView2WebView object's GoSearch function.
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	251 //WebView->GoSearch();
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	252 break;
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	253 }
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	254
2044 b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	255 case DW_HTML_RELOAD:
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	256 {
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	257 // Call the IWebView2WebView object's Refresh function.
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	258 WebView->Reload();
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	259 }
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	260
2044 b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	261 case DW_HTML_STOP:
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	262 {
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	263 // Call the IWebView2WebView object's Stop function.
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	264 //WebView->Stop();
b74b9afa31aa Win: Fix Edge/Chromium HTML widgets in notebook/tabbed widgets not being visible. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2043 diff changeset	265 }
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	266 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	267 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	268 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	269
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	270 int EdgeWebView::Raw(const char* string)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	271 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	272 if (WebView)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	273 WebView->NavigateToString(UTF8toWide(string));
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	274 return DW_ERROR_NONE;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	275 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	276
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	277 int EdgeWebView::URL(const char* url)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	278 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	279 if (WebView)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	280 WebView->Navigate(UTF8toWide(url));
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	281 return DW_ERROR_NONE;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	282 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	283
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	284 int EdgeWebView::JavascriptRun(const char* script, void* scriptdata)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	285 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	286 HWND thishwnd = hWnd;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	287
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	288 if (WebView)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	289 WebView->ExecuteScript(UTF8toWide(script),
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	290 Callback<IWebView2ExecuteScriptCompletedHandler>(
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	291 [thishwnd, scriptdata](HRESULT error, PCWSTR result) -> HRESULT
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	292 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	293 _wndproc(thishwnd, WM_USER + 100, (error == S_OK ? (WPARAM)WideToUTF8((LPWSTR)result) : NULL), (LPARAM)scriptdata);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	294 return S_OK;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	295 }).Get());
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	296 return DW_ERROR_NONE;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	297 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	298
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	299 VOID EdgeWebView::Setup(HWND hwnd, IWebView2WebView* webview)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	300 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	301 hWnd = hwnd;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	302 WebView = webview;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	303 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	304
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	305 VOID EdgeWebView::Close(VOID)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	306 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	307 if (WebView)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	308 WebView->Close();
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	309 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	310
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	311 EdgeBrowser *DW_EDGE = NULL;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	312
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	313 extern "C" {
2001 f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	314 /***************************** dw_edge_detect() ************************
f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	315 * Attempts to create a temporary Edge (Chromium) browser context...
f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	316 * If we succeed return TRUE and use Edge for HTML windows.
f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	317 * If it fails return FALSE and fall back to using embedded IE.
f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	318 */
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	319 BOOL _dw_edge_detect(VOID)
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	320 {
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	321 DW_EDGE = new EdgeBrowser;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	322 if (DW_EDGE)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	323 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	324 BOOL result = DW_EDGE->Detect();
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	325 if (!result)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	326 {
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	327 delete DW_EDGE;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	328 DW_EDGE = NULL;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	329 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	330 return result;
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	331 }
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	332 return FALSE;
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	333 }
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	334
2001 f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	335 /***************************** dw_edge_action() ************************
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	336 * Implements the functionality of a "Back". "Forward", "Home", "Search",
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	337 * "Refresh", or "Stop" button.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	338 *
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	339 * hwnd = Handle to the window hosting the browser object.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	340 * action = One of the following:
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	341 * 0 = Move back to the previously viewed web page.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	342 * 1 = Move forward to the previously viewed web page.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	343 * 2 = Move to the home page.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	344 * 3 = Search.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	345 * 4 = Refresh the page.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	346 * 5 = Stop the currently loading page.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	347 */
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	348
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	349 void _dw_edge_action(HWND hwnd, int action)
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	350 {
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	351 EdgeWebView* webview = (EdgeWebView *)dw_window_get_data(hwnd, _DW_HTML_DATA_NAME);
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	352 if (webview)
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	353 webview->Action(action);
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	354 }
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	355
2001 f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	356 /***************************** dw_edge_raw() **************************
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	357 * Takes a string containing some HTML BODY, and displays it in the specified
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	358 * window. For example, perhaps you want to display the HTML text of...
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	359 *
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	360 * <P>This is a picture.<P><IMG src="mypic.jpg">
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	361 *
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	362 * hwnd = Handle to the window hosting the browser object.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	363 * string = Pointer to nul-terminated string containing the HTML BODY.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	364 * (NOTE: No <BODY></BODY> tags are required in the string).
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	365 *
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	366 * RETURNS: 0 if success, or non-zero if an error.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	367 */
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	368
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	369 int _dw_edge_raw(HWND hwnd, const char* string)
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	370 {
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	371 EdgeWebView* webview = (EdgeWebView*)dw_window_get_data(hwnd, _DW_HTML_DATA_NAME);
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	372 if (webview)
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	373 return webview->Raw(string);
2001 f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	374 else
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	375 dw_window_set_data(hwnd, _DW_HTML_DATA_RAW, strdup(string));
2001 f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	376 return DW_ERROR_NONE;
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	377 }
4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	378
2001 f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	379 /***************************** dw_edge_url() **************************
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	380 * Displays a URL, or HTML file on disk.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	381 *
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	382 * hwnd = Handle to the window hosting the browser object.
2015 c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	383 * url = Pointer to nul-terminated name of the URL/file.
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	384 *
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	385 * RETURNS: 0 if success, or non-zero if an error.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	386 */
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	387
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	388 int _dw_edge_url(HWND hwnd, const char* url)
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	389 {
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	390 EdgeWebView* webview = (EdgeWebView*)dw_window_get_data(hwnd, _DW_HTML_DATA_NAME);
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	391 if (webview)
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	392 return webview->URL(url);
2001 f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	393 else
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	394 dw_window_set_data(hwnd, _DW_HTML_DATA_LOCATION, strdup(url));
2001 f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	395 return DW_ERROR_NONE;
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	396 }
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	397
2015 c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	398 /***************************** dw_edge_javascript_run() **************************
c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	399 * Runs a javascript in the specified browser context.
c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	400 *
c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	401 * hwnd = Handle to the window hosting the browser object.
c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	402 * script = Pointer to nul-terminated javascript string.
c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	403 * scriptdata = Pointer to user data to be passed to the callback.
c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	404 *
c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	405 * RETURNS: 0 if success, or non-zero if an error.
c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	406 */
c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	407
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	408 int _dw_edge_javascript_run(HWND hwnd, const char* script, void* scriptdata)
2015 c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	409 {
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	410 EdgeWebView* webview = (EdgeWebView*)dw_window_get_data(hwnd, _DW_HTML_DATA_NAME);
2015 c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	411 if (webview)
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	412 return webview->JavascriptRun(script, scriptdata);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	413 return DW_ERROR_UNKNOWN;
2015 c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	414 }
c30f4354966e Win: Added support for dw_html_javascript_run() using Edge (Chromium). bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2001 diff changeset	415
2001 f7acca46f795 Win: Fixes for Edge (Chromium) embedding, the loading can be delayed so... bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2000 diff changeset	416 /************************ edgeWindowProc() ***********************
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	417 * Our message handler for our window to host the browser.
77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	418 */
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	419
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	420 LRESULT CALLBACK _edgeWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
1999 4e808c4cadfb Win: Add initial support for Microsoft Edge (Chromium) embedding. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: diff changeset	421 {
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	422 if (DW_EDGE)
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	423 return DW_EDGE->WndProc(hWnd, uMsg, wParam, lParam);
0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	424 return DefWindowProc(hWnd, uMsg, wParam, lParam);
2000 77e43d71eaa7 Changes to allow mixing C and C++ when including dw.h. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 1999 diff changeset	425 }
2042 0d8b898b03e2 Win: Rewrite edge.cpp using C++ classes, EdgeBrowser and EdgeWebView. bsmith@81767d24-ef19-dc11-ae90-00e081727c95 parents: 2041 diff changeset	426 }

Mercurial > dwindows

annotate win/edge.cpp @ 2044:b74b9afa31aa