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

wxSpinCtrl abuses m_isShown. Don't use it for any logic

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott 2003-07-14 18:10:47 +00:00
parent 05b2214ba0
commit addbdd2985
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cocoa/window.mm
View File

@ -250,15 +250,16 @@ bool wxWindow::Show(bool show)
wxAutoNSAutoreleasePool pool; wxAutoNSAutoreleasePool pool;
// If the window is marked as visible, then it shouldn't have a dummy view // If the window is marked as visible, then it shouldn't have a dummy view
// If the window is marked hidden, then it should have a dummy view // If the window is marked hidden, then it should have a dummy view
wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),"wxWindow: m_isShown does not agree with m_dummyNSView"); // wxSpinCtrl (generic) abuses m_isShown, don't use it for any logic
// wxASSERT_MSG( (m_isShown && !m_dummyNSView) || (!m_isShown && m_dummyNSView),"wxWindow: m_isShown does not agree with m_dummyNSView");
// Return false if there isn't a window to show or hide // Return false if there isn't a window to show or hide
if(!m_cocoaNSView) if(!m_cocoaNSView)
return false; return false;
// Return false if the state isn't changing
if( show == m_isShown )
return false;
if(show) if(show)
{ {
// If state isn't changing, return false
if(!m_dummyNSView)
return false;
// replaceSubView releases m_dummyNSView, balancing the alloc // replaceSubView releases m_dummyNSView, balancing the alloc
[m_cocoaNSView retain]; [m_cocoaNSView retain];
[[m_dummyNSView superview] replaceSubview:m_dummyNSView with:m_cocoaNSView]; [[m_dummyNSView superview] replaceSubview:m_dummyNSView with:m_cocoaNSView];
@ -270,6 +271,9 @@ bool wxWindow::Show(bool show)
} }
else else
{ {
// If state isn't changing, return false
if(m_dummyNSView)
return false;
m_dummyNSView = [[NSView alloc] initWithFrame: [m_cocoaNSView frame]]; m_dummyNSView = [[NSView alloc] initWithFrame: [m_cocoaNSView frame]];
[m_dummyNSView retain]; [m_dummyNSView retain];
// NOTE: replaceSubView will cause m_cocaNSView to be released // NOTE: replaceSubView will cause m_cocaNSView to be released