reintroduced m_isBeingDeleted

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index e3824f30bba9cabc8f7f96a432eca64eb7bd7d3f..0cda00cb61adc39a54f12483bfb89e9c562e5762 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -107,10 +107,10 @@ bool wxFrame::Create(wxWindow *parent,
         return FALSE;
     
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
         return FALSE;
     
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;

-    
+

     m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
     m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;

-    
+

     wxModelessWindows.Append(this);
     
     return TRUE;
     wxModelessWindows.Append(this);
     
     return TRUE;


@@ -119,7 +119,6 @@ bool wxFrame::Create(wxWindow *parent,
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;

-    

     DeleteAllBars();
 }
 
     DeleteAllBars();
 }
 

diff --git a/src/mac/carbon/radiobox.cpp b/src/mac/carbon/radiobox.cpp
index fbf840fc8d5cbd537a63274ab086cd8d5594a25c..f7874dd09985593b6b517b1440cfe88df157fc76 100644 (file)
--- a/src/mac/carbon/radiobox.cpp
+++ b/src/mac/carbon/radiobox.cpp
@@ -77,6 +77,8 @@ wxRadioBox::wxRadioBox()
 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

+    m_isBeingDeleted = TRUE;
+

     wxRadioButton *next,*current;
     
     current=m_radioButtonCycle->NextInCycle();
     wxRadioButton *next,*current;
     
     current=m_radioButtonCycle->NextInCycle();

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 2d30db0296fa3b2b464964b3a3be20d4784b23a5..d68b00c5bdbd389c5186f040a82814ae7de8120d 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -104,6 +104,7 @@ void wxWindowMac::Init()
     // generic
     InitBase();
 
     // generic
     InitBase();
 

+    m_isBeingDeleted = FALSE;

     m_backgroundTransparent = FALSE;
 
     // as all windows are created with WS_VISIBLE style...
     m_backgroundTransparent = FALSE;
 
     // as all windows are created with WS_VISIBLE style...


@@ -139,6 +140,8 @@ wxWindowMac::~wxWindowMac()
         }
     }
 
         }
     }
 

+    m_isBeingDeleted = TRUE;
+    

 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:
     for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:
     for ( wxWindow *win = GetParent(); win; win = win->GetParent() )

diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp
index e3824f30bba9cabc8f7f96a432eca64eb7bd7d3f..0cda00cb61adc39a54f12483bfb89e9c562e5762 100644 (file)
--- a/src/mac/frame.cpp
+++ b/src/mac/frame.cpp
@@ -107,10 +107,10 @@ bool wxFrame::Create(wxWindow *parent,
         return FALSE;
     
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
         return FALSE;
     
     MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;

-    
+

     m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
     m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
     SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;

-    
+

     wxModelessWindows.Append(this);
     
     return TRUE;
     wxModelessWindows.Append(this);
     
     return TRUE;


@@ -119,7 +119,6 @@ bool wxFrame::Create(wxWindow *parent,
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;

-    

     DeleteAllBars();
 }
 
     DeleteAllBars();
 }
 

diff --git a/src/mac/radiobox.cpp b/src/mac/radiobox.cpp
index fbf840fc8d5cbd537a63274ab086cd8d5594a25c..f7874dd09985593b6b517b1440cfe88df157fc76 100644 (file)
--- a/src/mac/radiobox.cpp
+++ b/src/mac/radiobox.cpp
@@ -77,6 +77,8 @@ wxRadioBox::wxRadioBox()
 
 wxRadioBox::~wxRadioBox()
 {
 
 wxRadioBox::~wxRadioBox()
 {

+    m_isBeingDeleted = TRUE;
+

     wxRadioButton *next,*current;
     
     current=m_radioButtonCycle->NextInCycle();
     wxRadioButton *next,*current;
     
     current=m_radioButtonCycle->NextInCycle();

diff --git a/src/mac/window.cpp b/src/mac/window.cpp
index 2d30db0296fa3b2b464964b3a3be20d4784b23a5..d68b00c5bdbd389c5186f040a82814ae7de8120d 100644 (file)
--- a/src/mac/window.cpp
+++ b/src/mac/window.cpp
@@ -104,6 +104,7 @@ void wxWindowMac::Init()
     // generic
     InitBase();
 
     // generic
     InitBase();
 

+    m_isBeingDeleted = FALSE;

     m_backgroundTransparent = FALSE;
 
     // as all windows are created with WS_VISIBLE style...
     m_backgroundTransparent = FALSE;
 
     // as all windows are created with WS_VISIBLE style...


@@ -139,6 +140,8 @@ wxWindowMac::~wxWindowMac()
         }
     }
 
         }
     }
 

+    m_isBeingDeleted = TRUE;
+    

 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:
     for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
 #ifndef __WXUNIVERSAL__
     // VS: make sure there's no wxFrame with last focus set to us:
     for ( wxWindow *win = GetParent(); win; win = win->GetParent() )