merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions

View File

@@ -80,6 +80,7 @@ END_EVENT_TABLE()
BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit)
EVT_MENU(MDI_REFRESH, MyChild::OnRefresh)
EVT_MENU(MDI_CHANGE_TITLE, MyChild::OnChangeTitle)
EVT_CLOSE(MyChild::OnClose)
END_EVENT_TABLE()
@@ -123,11 +124,11 @@ bool MyApp::OnInit()
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(MDI_NEW_WINDOW, "&New window", "Create a new child window");
file_menu->Append(MDI_QUIT, "&Exit", "Quit the program");
file_menu->Append(MDI_NEW_WINDOW, "&New window\tCtrl-N", "Create a new child window");
file_menu->Append(MDI_QUIT, "&Exit\tAlt-X", "Quit the program");
wxMenu *help_menu = new wxMenu;
help_menu->Append(MDI_ABOUT, "&About");
help_menu->Append(MDI_ABOUT, "&About\tF1");
wxMenuBar *menu_bar = new wxMenuBar;
@@ -233,8 +234,8 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
wxMenu *option_menu = new wxMenu;
// Dummy option
option_menu->Append(MDI_REFRESH, "&Refresh picture");
option_menu->Append(MDI_CHANGE_TITLE, "Change &title...\tCtrl-T");
wxMenu *help_menu = new wxMenu;
help_menu->Append(MDI_ABOUT, "&About");
@@ -415,9 +416,25 @@ void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
Close(TRUE);
}
void MyChild::OnRefresh(wxCommandEvent& event)
void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))
{
Refresh();
if ( canvas )
canvas->Refresh();
}
void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event))
{
static wxString s_title = _T("Canvas Frame");
wxString title = wxGetTextFromUser(_T("Enter the new title for MDI child"),
_T("MDI sample question"),
s_title,
GetParent()->GetParent());
if ( !title )
return;
s_title = title;
SetTitle(s_title);
}
void MyChild::OnActivate(wxActivateEvent& event)