Mercurial > dwindows
comparison mac/dw.m @ 2975:ae4d6856b983
iOS: Support for dw_html_javascript_add() and DW_SIGNAL_HTML_MESSAGE.
Add DW_FEATURE_HTML_MESSAGE feature test and display in dwtest(oo).
Mac: Make sure code is in WK_API_ENABLED tests so old MacOS versions are
still supported.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Fri, 24 Mar 2023 17:15:59 +0000 |
parents | fffb4904c90b |
children | d84182f0054e |
comparison
equal
deleted
inserted
replaced
2974:fffb4904c90b | 2975:ae4d6856b983 |
---|---|
886 void **params = (void **)event; | 886 void **params = (void **)event; |
887 NSString *uri = params[1]; | 887 NSString *uri = params[1]; |
888 | 888 |
889 return htmlchangedfunc(handler->window, DW_POINTER_TO_INT(params[0]), (char *)[uri UTF8String], handler->data); | 889 return htmlchangedfunc(handler->window, DW_POINTER_TO_INT(params[0]), (char *)[uri UTF8String], handler->data); |
890 } | 890 } |
891 #if WK_API_ENABLED | |
891 /* HTML message event */ | 892 /* HTML message event */ |
892 case _DW_EVENT_HTML_MESSAGE: | 893 case _DW_EVENT_HTML_MESSAGE: |
893 { | 894 { |
894 int (* API htmlmessagefunc)(HWND, char *, char *, void *) = handler->signalfunction; | 895 int (* API htmlmessagefunc)(HWND, char *, char *, void *) = handler->signalfunction; |
895 WKScriptMessage *message = (WKScriptMessage *)event; | 896 WKScriptMessage *message = (WKScriptMessage *)event; |
896 | 897 |
897 return htmlmessagefunc(handler->window, (char *)[[message name] UTF8String], [[message body] isKindOfClass:[NSString class]] ? | 898 return htmlmessagefunc(handler->window, (char *)[[message name] UTF8String], [[message body] isKindOfClass:[NSString class]] ? |
898 (char *)[[message body] UTF8String] : NULL, handler->data); | 899 (char *)[[message body] UTF8String] : NULL, handler->data); |
899 } | 900 } |
901 #endif | |
900 } | 902 } |
901 } | 903 } |
902 return -1; | 904 return -1; |
903 } | 905 } |
904 | 906 |
13465 #ifdef BUILDING_FOR_SNOW_LEOPARD | 13467 #ifdef BUILDING_FOR_SNOW_LEOPARD |
13466 case DW_FEATURE_MLE_AUTO_COMPLETE: | 13468 case DW_FEATURE_MLE_AUTO_COMPLETE: |
13467 #endif | 13469 #endif |
13468 case DW_FEATURE_HTML: | 13470 case DW_FEATURE_HTML: |
13469 case DW_FEATURE_HTML_RESULT: | 13471 case DW_FEATURE_HTML_RESULT: |
13472 #if WK_API_ENABLED | |
13473 case DW_FEATURE_HTML_MESSAGE: | |
13474 #endif | |
13470 case DW_FEATURE_CONTAINER_STRIPE: | 13475 case DW_FEATURE_CONTAINER_STRIPE: |
13471 case DW_FEATURE_MLE_WORD_WRAP: | 13476 case DW_FEATURE_MLE_WORD_WRAP: |
13472 case DW_FEATURE_UTF8_UNICODE: | 13477 case DW_FEATURE_UTF8_UNICODE: |
13473 case DW_FEATURE_TREE: | 13478 case DW_FEATURE_TREE: |
13474 case DW_FEATURE_WINDOW_PLACEMENT: | 13479 case DW_FEATURE_WINDOW_PLACEMENT: |
13546 #ifdef BUILDING_FOR_SNOW_LEOPARD | 13551 #ifdef BUILDING_FOR_SNOW_LEOPARD |
13547 case DW_FEATURE_MLE_AUTO_COMPLETE: | 13552 case DW_FEATURE_MLE_AUTO_COMPLETE: |
13548 #endif | 13553 #endif |
13549 case DW_FEATURE_HTML: | 13554 case DW_FEATURE_HTML: |
13550 case DW_FEATURE_HTML_RESULT: | 13555 case DW_FEATURE_HTML_RESULT: |
13556 #if WK_API_ENABLED | |
13557 case DW_FEATURE_HTML_MESSAGE: | |
13558 #endif | |
13551 case DW_FEATURE_CONTAINER_STRIPE: | 13559 case DW_FEATURE_CONTAINER_STRIPE: |
13552 case DW_FEATURE_MLE_WORD_WRAP: | 13560 case DW_FEATURE_MLE_WORD_WRAP: |
13553 case DW_FEATURE_UTF8_UNICODE: | 13561 case DW_FEATURE_UTF8_UNICODE: |
13554 case DW_FEATURE_TREE: | 13562 case DW_FEATURE_TREE: |
13555 case DW_FEATURE_WINDOW_PLACEMENT: | 13563 case DW_FEATURE_WINDOW_PLACEMENT: |