From: <ma...@us...> - 2003-11-23 10:11:04
|
Update of /cvsroot/sharedaemon/ui-wx/src In directory sc8-pr-cvs1:/tmp/cvs-serv2514 Modified Files: MainDlg.cpp Log Message: Forgot to deallocate memory after removing menubar - fixed. Index: MainDlg.cpp =================================================================== RCS file: /cvsroot/sharedaemon/ui-wx/src/MainDlg.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- MainDlg.cpp 23 Nov 2003 09:52:43 -0000 1.4 +++ MainDlg.cpp 23 Nov 2003 10:11:00 -0000 1.5 @@ -358,14 +358,18 @@ */ void CMainDlg::CreateMyMenuBar() { bool show_menu = false; - SetMenuBar(NULL); + wxMenuBar *menubar = GetMenuBar(); + if (menubar != NULL) { + SetMenuBar(NULL); + delete menubar; + } m_config->Read(wxT("/General/Show menubar"), &show_menu, false); if (!show_menu) { return; } - wxMenuBar *menubar = new wxMenuBar(); + menubar = new wxMenuBar(); wxMenu *file_menu = new wxMenu(); file_menu->Append(ID_FILE_CONNECT, _("Connect")); |