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

reintroduced m_isBeingDeleted

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-05-09 07:12:02 +00:00
parent 7af6b69e74
commit 140f2012cd
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mac/carbon/frame.cpp
View File

@@ -107,10 +107,10 @@ bool wxFrame::Create(wxWindow *parent,
return FALSE; return FALSE;
MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ; m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ; SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
return TRUE; return TRUE;
@@ -119,7 +119,6 @@ bool wxFrame::Create(wxWindow *parent,
wxFrame::~wxFrame() wxFrame::~wxFrame()
{ {
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
DeleteAllBars(); DeleteAllBars();
} }

2
src/mac/carbon/radiobox.cpp
View File

@@ -77,6 +77,8 @@ wxRadioBox::wxRadioBox()
wxRadioBox::~wxRadioBox() wxRadioBox::~wxRadioBox()
{ {
m_isBeingDeleted = TRUE;
wxRadioButton *next,*current; wxRadioButton *next,*current;
current=m_radioButtonCycle->NextInCycle(); current=m_radioButtonCycle->NextInCycle();

3
src/mac/carbon/window.cpp
View File

@@ -104,6 +104,7 @@ void wxWindowMac::Init()
// generic // generic
InitBase(); InitBase();
m_isBeingDeleted = FALSE;
m_backgroundTransparent = FALSE; m_backgroundTransparent = FALSE;
// as all windows are created with WS_VISIBLE style... // as all windows are created with WS_VISIBLE style...
@@ -139,6 +140,8 @@ wxWindowMac::~wxWindowMac()
} }
} }
m_isBeingDeleted = TRUE;
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us: // VS: make sure there's no wxFrame with last focus set to us:
for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) for ( wxWindow *win = GetParent(); win; win = win->GetParent() )

5
src/mac/frame.cpp
View File

@@ -107,10 +107,10 @@ bool wxFrame::Create(wxWindow *parent,
return FALSE; return FALSE;
MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ; MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ; m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ; SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
return TRUE; return TRUE;
@@ -119,7 +119,6 @@ bool wxFrame::Create(wxWindow *parent,
wxFrame::~wxFrame() wxFrame::~wxFrame()
{ {
m_isBeingDeleted = TRUE; m_isBeingDeleted = TRUE;
DeleteAllBars(); DeleteAllBars();
} }

2
src/mac/radiobox.cpp
View File

@@ -77,6 +77,8 @@ wxRadioBox::wxRadioBox()
wxRadioBox::~wxRadioBox() wxRadioBox::~wxRadioBox()
{ {
m_isBeingDeleted = TRUE;
wxRadioButton *next,*current; wxRadioButton *next,*current;
current=m_radioButtonCycle->NextInCycle(); current=m_radioButtonCycle->NextInCycle();

3
src/mac/window.cpp
View File

@@ -104,6 +104,7 @@ void wxWindowMac::Init()
// generic // generic
InitBase(); InitBase();
m_isBeingDeleted = FALSE;
m_backgroundTransparent = FALSE; m_backgroundTransparent = FALSE;
// as all windows are created with WS_VISIBLE style... // as all windows are created with WS_VISIBLE style...
@@ -139,6 +140,8 @@ wxWindowMac::~wxWindowMac()
} }
} }
m_isBeingDeleted = TRUE;
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
// VS: make sure there's no wxFrame with last focus set to us: // VS: make sure there's no wxFrame with last focus set to us:
for ( wxWindow *win = GetParent(); win; win = win->GetParent() ) for ( wxWindow *win = GetParent(); win; win = win->GetParent() )