Mercurial > dwindows

changeset 2023:3f265cd5b069

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mac: Added cleanup to the DWWebView subclasses and userdata for dw_window_set_data() on it.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 09 Nov 2019 07:43:04 +0000
parents 28809bf17957
children 8a11bb8ec347
files mac/dw.m
diffstat 1 files changed, 19 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Sat Nov 09 07:18:21 2019 +0000
+++ b/mac/dw.m	Sat Nov 09 07:43:04 2019 +0000
@@ -1342,14 +1342,21 @@
  * WKWebKit on intel 64 and the old WebKit on intel 32 bit and earlier.
  */
 #if WK_API_ENABLED
-@interface DWWebView : WKWebView <WKNavigationDelegate> { }
+@interface DWWebView : WKWebView <WKNavigationDelegate>
+{
+    void *userdata;
+}
+-(void *)userdata;
+-(void)setUserdata:(void *)input;
 -(void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation;
 -(void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation;
 -(void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation;
 -(void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation *)navigation;
 @end
 
-@implementation DWWebView : WKWebView { }
+@implementation DWWebView : WKWebView
+-(void *)userdata { return userdata; }
+-(void)setUserdata:(void *)input { userdata = input; }
 -(void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation
 {
     void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_STARTED), [[self URL] absoluteString] };
@@ -1370,16 +1377,23 @@
     void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_REDIRECT), [[self URL] absoluteString] };
     _event_handler(self, (NSEvent *)params, 19);
 }
+-(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 #else
 @interface DWWebView : WebView
-{ }
+{
+    void *userdata;
+}
+-(void *)userdata;
+-(void)setUserdata:(void *)input;
 -(void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame;
 -(void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame;
 -(void)webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame;
 @end
 
-@implementation DWWebView : WebView { }
+@implementation DWWebView : WebView
+-(void *)userdata { return userdata; }
+-(void)setUserdata:(void *)input { userdata = input; }
 -(void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
 {
     void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_COMPLETE), [self mainFrameURL] };
@@ -1395,6 +1409,7 @@
     void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_LOADING), [self mainFrameURL] };
     _event_handler(self, (NSEvent *)params, 19);
 }
+-(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 #endif