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

Added wxMenu::Delete() and fixed some menu deleted memory

Browse Source 
leaks. Some.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-10-11 19:32:58 +00:00
parent 147bc49159
commit d1b15f03b8
7 changed files with 98 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/dnd/dnd.cpp
View File

@@ -133,7 +133,9 @@ enum
Menu_CopyBitmap,
Menu_PasteBitmap,
Menu_HasText,
Menu_HasBitmap
Menu_HasBitmap,
Menu_ToBeGreyed, /* for testing */
Menu_ToBeDeleted /* for testing */
};
BEGIN_EVENT_TABLE(DnDFrame, wxFrame)
@@ -184,11 +186,19 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
CreateStatusBar();
// construct sub menu for testing
wxMenu *sub_menu = new wxMenu;
sub_menu->Append(Menu_Quit, "E&xit");
sub_menu->Append(Menu_Quit, "E&xit");
sub_menu->Append(Menu_Quit, "E&xit");
// construct menu
wxMenu *file_menu = new wxMenu;
file_menu->Append(Menu_Drag, "&Test drag...");
file_menu->AppendSeparator();
file_menu->Append(Menu_Quit, "E&xit");
file_menu->AppendSeparator();
file_menu->Append( 0, "More exit menus", sub_menu);
wxMenu *log_menu = new wxMenu;
log_menu->Append(Menu_Clear, "Clear");
@@ -417,6 +427,11 @@ void DnDFrame::OnRightDown(wxMouseEvent &event )
menu->Append(Menu_Drag, "&Test drag...");
menu->Append(Menu_About, "&About");
menu->Append(Menu_Quit, "E&xit");
menu->Append(Menu_ToBeDeleted, "To be deleted");
menu->Append(Menu_ToBeGreyed, "To be greyed");
menu->Delete( Menu_ToBeDeleted );
menu->Enable( Menu_ToBeGreyed, FALSE );
PopupMenu( menu, event.GetX(), event.GetY() );
}