X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctgraphics%2Fsgp.cpp;h=f22dd378300339355e4757e1b88a93d6222a269d;hb=9727d14397360a862a407b9c35efefe35925791b;hp=07e103f182e054d3f20fbd74c1cf83de54169e1c;hpb=267a9d7d6a5fea883f2797c050a6fbf5cc037276;p=ctsim.git diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp index 07e103f..f22dd37 100644 --- 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 ** -** $Id: sgp.cpp,v 1.16 2000/10/11 08:16:08 kevin Exp $ +** $Id: sgp.cpp,v 1.19 2000/12/18 02:23:43 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 @@ -52,14 +52,14 @@ RGBColor SGP::s_aRGBColor[] = 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 -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 @@ -103,7 +103,8 @@ SGP::SGP (const SGPDriver& driver) m_font.SetPointSize (iTestPointSize); m_driver.idWX()->SetFont(m_font); double dTestCharHeight = m_driver.idWX()->GetCharHeight(); - m_dPointsPerPixel = iTestPointSize / dTestCharHeight; + m_dPointsPerPixel = iTestPointSize / dTestCharHeight; + m_driver.idWX()->SetBrush (*wxWHITE_BRUSH); } #endif @@ -596,7 +597,7 @@ SGP::pointRel (double x, double y) void -SGP::drawText (const string& rsMessage) +SGP::drawText (const std::string& rsMessage) { drawText (rsMessage.c_str()); }