Sorry, I went and removed consts as per the style guide :-)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-04 15:17:59 +00:00
parent eafc087e69
commit debe6624c1
252 changed files with 2684 additions and 2981 deletions

View File

@@ -1308,7 +1308,7 @@ BEGIN_EVENT_TABLE(wxDocChildFrame, wxFrame)
END_EVENT_TABLE()
wxDocChildFrame::wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, const wxString& title,
const wxPoint& pos, const wxSize& size, const long style, const wxString& name):
const wxPoint& pos, const wxSize& size, long style, const wxString& name):
wxFrame(frame, -1, title, pos, size, style, name)
{
m_childDocument = doc;
@@ -1339,18 +1339,6 @@ bool wxDocChildFrame::ProcessEvent(wxEvent& event)
return TRUE;
}
/*
// Intercept menu commands
void wxDocChildFrame::OldOnMenuCommand(int id)
{
if (m_childView)
m_childView->Activate(TRUE);
if (GetParent())
((wxFrame *)GetParent())->OldOnMenuCommand(id);
}
*/
void wxDocChildFrame::OnActivate(wxActivateEvent& event)
{
wxFrame::OnActivate(event);
@@ -1389,7 +1377,7 @@ BEGIN_EVENT_TABLE(wxDocParentFrame, wxFrame)
END_EVENT_TABLE()
wxDocParentFrame::wxDocParentFrame(wxDocManager *manager, wxFrame *frame, const wxString& title,
const wxPoint& pos, const wxSize& size, const long style, const wxString& name):
const wxPoint& pos, const wxSize& size, long style, const wxString& name):
wxFrame(frame, -1, title, pos, size, style, name)
{
m_docManager = manager;
@@ -1417,40 +1405,6 @@ bool wxDocParentFrame::ProcessEvent(wxEvent& event)
return TRUE;
}
/*
// Intercept menu commands
void wxDocParentFrame::OldOnMenuCommand(int id)
{
switch (id)
{
case wxID_EXIT:
{
Close();
break;
}
case wxID_FILE1:
case wxID_FILE2:
case wxID_FILE3:
case wxID_FILE4:
case wxID_FILE5:
case wxID_FILE6:
case wxID_FILE7:
case wxID_FILE8:
case wxID_FILE9:
{
wxString f(m_docManager->GetHistoryFile(id-wxID_FILE1));
if (f != "")
(void)m_docManager->CreateDocument(f, wxDOC_SILENT);
break;
}
default:
{
m_docManager->OldOnMenuCommand(id);
}
}
}
*/
// Define the behaviour for the frame closing
// - must delete all frames except for the main one.
bool wxDocParentFrame::OnClose(void)