projects
/
ctsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c70eb59
)
r388: *** empty log message ***
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sat, 13 Jan 2001 04:14:03 +0000
(
04:14
+0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Sat, 13 Jan 2001 04:14:03 +0000
(
04:14
+0000)
tools/ctsimtext.cpp
patch
|
blob
|
history
diff --git
a/tools/ctsimtext.cpp
b/tools/ctsimtext.cpp
index 6983cb0fe6e1614017cffa53c66412509fc56671..44a374615ad020e828659afa4313483e092d123f 100644
(file)
--- a/
tools/ctsimtext.cpp
+++ b/
tools/ctsimtext.cpp
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: ctsimtext.cpp,v 1.
9 2001/01/13 03:51:35
kevin Exp $
+** $Id: ctsimtext.cpp,v 1.
10 2001/01/13 04:14:03
kevin Exp $
**
** 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
@@
-45,8
+45,9
@@
extern "C" {
// If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that
// linked name as name of function.
// If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that
// linked name as name of function.
-static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.
9 2001/01/13 03:51:35
kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.
10 2001/01/13 04:14:03
kevin Exp $";
static const char* const s_szProgramName = "ctsimtext";
static const char* const s_szProgramName = "ctsimtext";
+static const char* const s_szProgramName2 = "ctsimtext.exe";
extern int if1_main (int argc, char* const argv[]);
extern int if2_main (int argc, char* const argv[]);
extern int if1_main (int argc, char* const argv[]);
extern int if2_main (int argc, char* const argv[]);
@@
-103,7
+104,7
@@
ctsimtext_main (int argc, char * argv[])
{
int iReturn = 0;
{
int iReturn = 0;
- if (argc > 1 &&
strcmp(argv[0], fileBasename (s_szProgramName)) == 0
) {
+ if (argc > 1 &&
(strcmp(argv[0], fileBasename (s_szProgramName)) == 0 || strcmp(argv[0], fileBasename (s_szProgramName2)) == 0)
) {
argv = &argv[1];
argc--;
iReturn = processCommand (argc, argv);
argv = &argv[1];
argc--;
iReturn = processCommand (argc, argv);
@@
-278,14
+279,20
@@
main (int argc, char* argv[])
#ifdef HAVE_WXWINDOWS
#include "../src/dlgezplot.h"
#ifdef HAVE_WXWINDOWS
#include "../src/dlgezplot.h"
+#ifdef MSVC
+unsigned long
+wxDialog::OnCtlColor(unsigned long a,unsigned long b,unsigned int c,unsigned int d,unsigned int e,long f)
+{return 0;}
+
+#else // not MSVC
+
+#endif
+
EZPlotDialog::EZPlotDialog (wxWindow* parent)
EZPlotDialog::EZPlotDialog (wxWindow* parent)
+ : wxDialog(), m_pEZPlotCtrl(NULL)
{}
EZPlotDialog::~EZPlotDialog()
{}
{}
EZPlotDialog::~EZPlotDialog()
{}
-unsigned long
-wxDialog::OnCtlColor(unsigned long a,unsigned long b,unsigned int c,unsigned int d,unsigned int e,long f)
-{return 0;}
-
-#endif
\ No newline at end of file
+#endif