projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r265: added HAVE_SSTREAM checking
[ctsim.git]
/
libctgraphics
/
sgp.cpp
diff --git
a/libctgraphics/sgp.cpp
b/libctgraphics/sgp.cpp
index d9c9caad553a7b466eb5d257411d51bb48fc16c9..ad33f758cda20e764a55cc52909ad788c8feaa6b 100644
(file)
--- a/
libctgraphics/sgp.cpp
+++ b/
libctgraphics/sgp.cpp
@@
-7,7
+7,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: sgp.cpp,v 1.1
5 2000/09/07 04:59:42
kevin Exp $
+** $Id: sgp.cpp,v 1.1
8 2000/12/16 06:12:47
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
@@
-52,14
+52,14
@@
RGBColor SGP::s_aRGBColor[] =
int SGP::s_iRGBColorCount = sizeof(s_aRGBColor) / sizeof(class RGBColor);
#ifdef HAVE_WXWINDOWS
int SGP::s_iRGBColorCount = sizeof(s_aRGBColor) / sizeof(class RGBColor);
#ifdef HAVE_WXWINDOWS
-SGPDriver::SGPDriver (wxDC* pDC, int xsize
= 640, int ysize = 480
)
+SGPDriver::SGPDriver (wxDC* pDC, int xsize
, int ysize
)
: m_iPhysicalXSize(xsize), m_iPhysicalYSize(ysize), m_idDriver(0), m_pDC(pDC)
{
m_idDriver |= SGPDRIVER_WXWINDOWS;
}
#endif
: m_iPhysicalXSize(xsize), m_iPhysicalYSize(ysize), m_idDriver(0), m_pDC(pDC)
{
m_idDriver |= SGPDRIVER_WXWINDOWS;
}
#endif
-SGPDriver::SGPDriver (const char* szWinTitle
= "", int xsize = 640, int ysize = 480
)
+SGPDriver::SGPDriver (const char* szWinTitle
, int xsize, int ysize
)
: m_iPhysicalXSize(xsize), m_iPhysicalYSize(ysize), m_sWindowTitle(szWinTitle), m_idDriver(0)
{
#ifdef HAVE_G2_H
: m_iPhysicalXSize(xsize), m_iPhysicalYSize(ysize), m_sWindowTitle(szWinTitle), m_idDriver(0)
{
#ifdef HAVE_G2_H
@@
-460,7
+460,7
@@
SGP::setTextPointSize (double height)
#endif
#if HAVE_WXWINDOWS
if (m_driver.isWX()) {
#endif
#if HAVE_WXWINDOWS
if (m_driver.isWX()) {
- m_font.SetPointSize (
height
);
+ m_font.SetPointSize (
static_cast<int>(height+0.5)
);
m_driver.idWX()->SetFont (m_font);
}
#endif
m_driver.idWX()->SetFont (m_font);
}
#endif
@@
-596,7
+596,7
@@
SGP::pointRel (double x, double y)
void
void
-SGP::drawText (const string& rsMessage)
+SGP::drawText (const st
d::st
ring& rsMessage)
{
drawText (rsMessage.c_str());
}
{
drawText (rsMessage.c_str());
}