projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automated commit for upstream build of version 5.0.5
[ctsim.git]
/
src
/
ctsim.cpp
diff --git
a/src/ctsim.cpp
b/src/ctsim.cpp
index 48dd5360a9646e3807fef7ff3cd47b0c1f569bbb..d58e7daecc5e274ddb736c92f20f16ffca023383 100644
(file)
--- a/
src/ctsim.cpp
+++ b/
src/ctsim.cpp
@@
-7,9
+7,7
@@
** Date Started: July 2000
**
** This is part of the CTSim program
** Date Started: July 2000
**
** This is part of the CTSim program
-** Copyright (c) 1983-2001 Kevin Rosenberg
-**
-** $Id$
+** Copyright (c) 1983-2009 Kevin Rosenberg
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
@@
-179,13
+177,13
@@
CTSimApp::OnInit()
int xDisplay, yDisplay;
::wxDisplaySize (&xDisplay, &yDisplay);
int xDisplay, yDisplay;
::wxDisplaySize (&xDisplay, &yDisplay);
- m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, _T("CTSim"), wxPoint(0, 0),
#ifdef CTSIM_MDI
#ifdef CTSIM_MDI
- wxSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .75)),
+ wxSize frameSize(nearest<int>(xDisplay * .75), nearest<int>(yDisplay * .75));
#else
#else
- wxSize(nearest<int>(xDisplay * .6), nearest<int>(yDisplay * .4)),
+ wxSize frameSize(nearest<int>(xDisplay * .6), nearest<int>(yDisplay * .4));
#endif
#endif
- wxDEFAULT_FRAME_STYLE);
+
+ m_pFrame = new MainFrame(m_docManager, (wxFrame *) NULL, -1, _T("CTSim"), wxPoint(0, 0), frameSize, wxDEFAULT_FRAME_STYLE);
setIconForFrame (m_pFrame);
m_pFrame->Centre(wxBOTH);
setIconForFrame (m_pFrame);
m_pFrame->Centre(wxBOTH);
@@
-209,7
+207,7
@@
CTSimApp::OnInit()
m_pLogDoc->getView()->getFrame()->Show (true);
} else
#else
m_pLogDoc->getView()->getFrame()->Show (true);
} else
#else
- m_pLog = new wxTextCtrl (m_pFrame, -1, _T("Log Window\n"), wxPoint(0, 0),
wxSize(0,0)
, wxTE_MULTILINE | wxTE_READONLY);
+ m_pLog = new wxTextCtrl (m_pFrame, -1, _T("Log Window\n"), wxPoint(0, 0),
frameSize
, wxTE_MULTILINE | wxTE_READONLY);
#endif
wxLog::SetActiveTarget (new wxLogTextCtrl(m_pLog));
#endif
wxLog::SetActiveTarget (new wxLogTextCtrl(m_pLog));