Mercurial > dwindows

changeset 2988:dfab2dfa9bc1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check DW_FEATURE_HTML_MESSAGE to decide if the raw html widget should have the javascript code or not. This prevents error popups when clicking the "dwtest" text when using the IE HTML widget.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 04 Apr 2023 01:08:14 +0000
parents 0e47ca67aab0
children fed8a986d565
files dwtest.c dwtestoo.cpp
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/dwtest.c	Mon Apr 03 09:16:58 2023 +0000
+++ b/dwtest.c	Tue Apr 04 01:08:14 2023 +0000
@@ -2105,7 +2105,9 @@
         dw_box_pack_start(notebookbox7, rawhtml, 0, 100, TRUE, FALSE, 0);
         dw_html_javascript_add(rawhtml, "test");
         dw_signal_connect(rawhtml, DW_SIGNAL_HTML_MESSAGE, DW_SIGNAL_FUNC(web_html_message), DW_POINTER(javascript));
-        dw_html_raw(rawhtml, "<html><body><center><h1><a href=\"javascript:test('This is the message');\">dwtest</a></h1></center></body></html>");
+        dw_html_raw(rawhtml, dw_feature_get(DW_FEATURE_HTML_MESSAGE) == DW_FEATURE_ENABLED ?
+                    "<html><body><center><h1><a href=\"javascript:test('This is the message');\">dwtest</a></h1></center></body></html>" :
+                    "<html><body><center><h1>dwtest</h1></center></body></html>");
         html = dw_html_new(1002);
 
         dw_box_pack_start(notebookbox7, hbox, 0, 0, TRUE, FALSE, 0);
--- a/dwtestoo.cpp	Mon Apr 03 09:16:58 2023 +0000
+++ b/dwtestoo.cpp	Tue Apr 04 01:08:14 2023 +0000
@@ -1623,7 +1623,9 @@
                               "Name: " + name + " Message: " + message);
                 return TRUE;
             });
-            rawhtml->Raw("<html><body><center><h1><a href=\"javascript:test('This is the message');\">dwtest</a></h1></center></body></html>");
+            rawhtml->Raw(dw_feature_get(DW_FEATURE_HTML_MESSAGE) == DW_FEATURE_ENABLED ?
+                         "<html><body><center><h1><a href=\"javascript:test('This is the message');\">dwtest</a></h1></center></body></html>" :
+                         "<html><body><center><h1>dwtest</h1></center></body></html>");
             DW::HTML *html = new DW::HTML();
 
             notebookbox->PackStart(hbox, 0, 0, TRUE, FALSE, 0);