From 3edf984f18a95149edead5de3d10ec696e7f1c5d Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 7 Sep 2000 04:59:42 +0000 Subject: [PATCH] r193: *** empty log message *** --- libctgraphics/sgp.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp index 4790a23..d9c9caa 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.14 2000/09/04 09:06:46 kevin Exp $ +** $Id: sgp.cpp,v 1.15 2000/09/07 04:59:42 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 @@ -70,8 +70,10 @@ SGPDriver::SGPDriver (const char* szWinTitle = "", int xsize = 640, int ysize = SGPDriver::~SGPDriver () { +#if HAVE_G2_H if (isG2()) g2_close (m_idG2); +#endif } @@ -92,18 +94,18 @@ SGP::SGP (const SGPDriver& driver) #if HAVE_WXWINDOWS m_pen.SetWidth(1); m_pen.SetStyle(wxSOLID); -#endif if (m_driver.isWX()) { - static const double dScreenDPI = 82; - static const double dPointsPerInch = 72.; - m_dPointsPerPixel = dPointsPerInch / dScreenDPI; - const int iTestPointSize = 72; - m_font.SetPointSize (iTestPointSize); - m_driver.idWX()->SetFont(m_font); - double dTestCharHeight = m_driver.idWX()->GetCharHeight(); - m_dPointsPerPixel = iTestPointSize / dTestCharHeight; + static const double dScreenDPI = 82; + static const double dPointsPerInch = 72.; + m_dPointsPerPixel = dPointsPerInch / dScreenDPI; + const int iTestPointSize = 72; + m_font.SetPointSize (iTestPointSize); + m_driver.idWX()->SetFont(m_font); + double dTestCharHeight = m_driver.idWX()->GetCharHeight(); + m_dPointsPerPixel = iTestPointSize / dTestCharHeight; } +#endif setWindow (0., 0., 1., 1.); setViewport (0., 0., 1., 1.); -- 2.34.1