suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

destructor must zero out fields that are WXGC_IGNOREd

Browse Source 
svn: r4975
This commit is contained in:
Matthew Flatt 2006-11-29 01:08:36 +00:00
parent ee88a04972
commit c6d593419b
6 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wxmac/src/mac/wxMacDC.cc
View File

@ -24,6 +24,7 @@ wxMacDC::wxMacDC(CGrafPtr port)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxMacDC::~wxMacDC(void) // destructor wxMacDC::~wxMacDC(void) // destructor
{ {
cCurrentUser = NULL;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

12
src/wxmac/src/mac/wx_menu.cc
View File

@ -194,11 +194,13 @@ wxMenu::~wxMenu(void)
wxNode* node; wxNode* node;
wxMenuItem* item; wxMenuItem* item;
if (menu_bar) // may have to remove menu from the current mac menu bar if (menu_bar) { // may have to remove menu from the current mac menu bar
{ menu_bar->Delete(this);
menu_bar->Delete(this); menu_bar = NULL;
} else if (window_parent) } else if (window_parent) {
((wxMenu *)window_parent)->Delete(this, 0, -1); ((wxMenu *)window_parent)->Delete(this, 0, -1);
window_parent = NULL;
}
::DisposeMenu(cMacMenu); // does not dispose of submenus ::DisposeMenu(cMacMenu); // does not dispose of submenus

8
src/wxmac/src/mac/wx_print.cc
View File

@ -115,11 +115,15 @@ wxPrintData::wxPrintData(void)
wxPrintData::~wxPrintData(void) wxPrintData::~wxPrintData(void)
{ {
if (cPrintSettings) if (cPrintSettings) {
PMRelease(cPrintSettings); PMRelease(cPrintSettings);
cPrintSettings = NULL;
}
if (cPageFormat) if (cPageFormat) {
PMRelease(cPageFormat); PMRelease(cPageFormat);
cPageFormat = NULL;
}
if (cPrintSession) { if (cPrintSession) {
PMRelease(cPrintSession); PMRelease(cPrintSession);

5
src/wxmac/src/mac/wx_win.cc
View File

@ -363,6 +363,11 @@ wxWindow::~wxWindow(void) // Destructor
DisposeControl(cPaintControl); DisposeControl(cPaintControl);
cPaintControl = NULL; cPaintControl = NULL;
} }
/* Must zero out fieldsd that are WXGC_IGNOREd: */
cParentArea = NULL;
cMacDC = NULL;
window_parent = NULL;
} }
//============================================================================= //=============================================================================

3
src/wxwindow/src/base/wb_item.cxx
View File

@ -153,6 +153,8 @@ wxbMenu::wxbMenu (char *Title, wxFunction WXUNUSED(func))
// The wxWindow destructor will take care of deleting the submenus. // The wxWindow destructor will take care of deleting the submenus.
wxbMenu::~wxbMenu (void) wxbMenu::~wxbMenu (void)
{ {
menu_bar= NULL;
top_level_menu = NULL;
} }
wxMenuItem *wxbMenu::FindItemForId (long itemId, wxMenu ** itemMenu, int * pos) wxMenuItem *wxbMenu::FindItemForId (long itemId, wxMenu ** itemMenu, int * pos)
@ -252,6 +254,7 @@ wxbMenuBar::wxbMenuBar (int N, wxMenu * Menus[], char *Titles[])
wxbMenuBar::~wxbMenuBar (void) wxbMenuBar::~wxbMenuBar (void)
{ {
menu_bar_frame = NULL;
} }
void wxbMenuBar::Append (wxMenu * menu, char *title) void wxbMenuBar::Append (wxMenu * menu, char *title)

1
src/wxwindow/src/msw/wx_choic.cxx
View File

@ -466,6 +466,7 @@ wxCombo::wxCombo(wxWindow *for_canvas,
wxCombo::~wxCombo(void) wxCombo::~wxCombo(void)
{ {
forCanvas = NULL;
} }
Bool wxCombo::PreOnEvent(wxWindow *win, wxMouseEvent *e) Bool wxCombo::PreOnEvent(wxWindow *win, wxMouseEvent *e)