Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Contrary to what I had thought, the addSubview and replaceSubview:with:

Browse Source 
messages do in fact retain the new subview properly.  This is what the
documentation clearly states, and it checks out when looking at the
retainCount.  I think I had been covering up a bug which I've since fixed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-08-06 14:44:18 +00:00
parent d07825bc2f
commit d4675cac4e
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/cocoa/window.mm
View File

@@ -80,13 +80,6 @@ wxWindow::~wxWindow()
void wxWindowCocoa::CocoaAddChild(wxWindowCocoa *child) void wxWindowCocoa::CocoaAddChild(wxWindowCocoa *child)
{ {
[child->m_cocoaNSView retain];
// NOTE: addSubView takes ownership of, but does not retain the subview
// Upon a removeFromView or closing the super view, the child WILL be
// released!!! I think the idea here is that normally you would alloc
// the subview and add it to the superview and this way you don't have
// to release what you just alloced. Unfortunately, that doesn't
// make sense for wxCocoa, so we do this instead.
[m_cocoaNSView addSubview: child->m_cocoaNSView]; [m_cocoaNSView addSubview: child->m_cocoaNSView];
wxASSERT(!child->m_dummyNSView); wxASSERT(!child->m_dummyNSView);
child->m_isShown = true; child->m_isShown = true;
@@ -97,9 +90,9 @@ void wxWindowCocoa::CocoaRemoveFromParent(void)
if(m_dummyNSView) if(m_dummyNSView)
{ {
wxASSERT(m_cocoaNSView); wxASSERT(m_cocoaNSView);
// balances the alloc // balances the replaceSubView:with:
[m_dummyNSView removeFromSuperview]; [m_dummyNSView removeFromSuperview];
// But since we also retained it ourselves // But since we were the ones to alloc it
[m_dummyNSView release]; [m_dummyNSView release];
m_dummyNSView = nil; m_dummyNSView = nil;
// m_cocoaNSView has of course already been removed by virtue of // m_cocoaNSView has of course already been removed by virtue of
@@ -262,11 +255,11 @@ bool wxWindow::Show(bool show)
// If state isn't changing, return false // If state isn't changing, return false
if(!m_dummyNSView) if(!m_dummyNSView)
return false; return false;
// replaceSubView releases m_dummyNSView, balancing the alloc // replaceSubView:with: releases m_dummyNSView, balancing the
[m_cocoaNSView retain]; // previous replaceSubView:with
[[m_dummyNSView superview] replaceSubview:m_dummyNSView with:m_cocoaNSView]; [[m_dummyNSView superview] replaceSubview:m_dummyNSView with:m_cocoaNSView];
// But since we also retained it ourselves
wxASSERT(![m_dummyNSView superview]); wxASSERT(![m_dummyNSView superview]);
// But since we were the ones to alloc it
[m_dummyNSView release]; [m_dummyNSView release];
m_dummyNSView = nil; m_dummyNSView = nil;
wxASSERT([m_cocoaNSView superview]); wxASSERT([m_cocoaNSView superview]);
@@ -277,8 +270,8 @@ bool wxWindow::Show(bool show)
if(m_dummyNSView) if(m_dummyNSView)
return false; return false;
m_dummyNSView = [[NSView alloc] initWithFrame: [m_cocoaNSView frame]]; m_dummyNSView = [[NSView alloc] initWithFrame: [m_cocoaNSView frame]];
[m_dummyNSView retain]; // NOTE: replaceSubView will cause m_cocaNSView to be (auto)released
// NOTE: replaceSubView will cause m_cocaNSView to be released // which balances out addSubView
[[m_cocoaNSView superview] replaceSubview:m_cocoaNSView with:m_dummyNSView]; [[m_cocoaNSView superview] replaceSubview:m_cocoaNSView with:m_dummyNSView];
// m_coocaNSView is now only retained by us // m_coocaNSView is now only retained by us
wxASSERT([m_dummyNSView superview]); wxASSERT([m_dummyNSView superview]);
@@ -500,7 +493,6 @@ void wxWindow::Raise()
wxAutoNSAutoreleasePool pool; wxAutoNSAutoreleasePool pool;
NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView; NSView *nsview = m_dummyNSView?m_dummyNSView:m_cocoaNSView;
NSView *superview = [nsview superview]; NSView *superview = [nsview superview];
[nsview retain];
[nsview removeFromSuperview]; [nsview removeFromSuperview];
[superview addSubview:nsview]; [superview addSubview:nsview];
} }