X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/feea7c52e97ce11593a068ac4e99057300f56b7e..4fcd60c72f6b90f5063f7000ff5a80a9004055a3:/samples/docvwmdi/docview.cpp diff --git a/samples/docvwmdi/docview.cpp b/samples/docvwmdi/docview.cpp index 9889a2f146..900f20cfdd 100644 --- a/samples/docvwmdi/docview.cpp +++ b/samples/docvwmdi/docview.cpp @@ -64,7 +64,9 @@ bool MyApp::OnInit(void) CLASSINFO(TextEditDocument), CLASSINFO(TextEditView)); //// Create the main frame window - frame = new MyFrame((wxDocManager *) m_docManager, (wxFrame *) NULL, (const wxString) "DocView Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE); + frame = new MyFrame((wxDocManager *) m_docManager, (wxFrame *) NULL, + "DocView Demo", wxPoint(0, 0), wxSize(500, 400), + wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE); //// Give it an icon (this is ignored in MDI mode: uses resources) #ifdef __WXMSW__ @@ -78,17 +80,17 @@ bool MyApp::OnInit(void) wxMenu *file_menu = new wxMenu; wxMenu *edit_menu = (wxMenu *) NULL; - file_menu->Append(wxID_NEW, "&New..."); - file_menu->Append(wxID_OPEN, "&Open..."); + file_menu->Append(wxID_NEW, "&New...\tCtrl-N"); + file_menu->Append(wxID_OPEN, "&Open...\tCtrl-X"); file_menu->AppendSeparator(); - file_menu->Append(wxID_EXIT, "E&xit"); + file_menu->Append(wxID_EXIT, "E&xit\tAlt-X"); // A nice touch: a history of files visited. Use this menu. m_docManager->FileHistoryUseMenu(file_menu); wxMenu *help_menu = new wxMenu; - help_menu->Append(DOCVIEW_ABOUT, "&About"); + help_menu->Append(DOCVIEW_ABOUT, "&About\tF1"); wxMenuBar *menu_bar = new wxMenuBar; @@ -121,8 +123,11 @@ int MyApp::OnExit(void) wxMDIChildFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas) { //// Make a child frame - wxDocMDIChildFrame *subframe = new wxDocMDIChildFrame(doc, view, GetMainFrame(), -1, "Child Frame", - wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE); + wxDocMDIChildFrame *subframe = + new wxDocMDIChildFrame(doc, view, GetMainFrame(), -1, "Child Frame", + wxPoint(10, 10), wxSize(300, 300), + wxDEFAULT_FRAME_STYLE | + wxNO_FULL_REPAINT_ON_RESIZE); #ifdef __WXMSW__ subframe->SetIcon(wxString(isCanvas ? "chart" : "notepad"));