X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fsgp.h;h=67f1b7c81ed9af6df9d3295ccb56c87fac85cc9b;hb=ca7c001fce978b680543f8338a404b8c0701a935;hp=2a1472b20ee9ba80c4c144b80d09e3d8d5e86266;hpb=5ec5449357eaae253d6b1026621262480e2efa63;p=ctsim.git diff --git a/include/sgp.h b/include/sgp.h index 2a1472b..67f1b7c 100644 --- a/include/sgp.h +++ b/include/sgp.h @@ -7,9 +7,9 @@ ** Date Started: 1984 ** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: sgp.h,v 1.23 2000/12/25 21:54:26 kevin Exp $ +** $Id: sgp.h,v 1.26 2001/01/28 19:10:18 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 @@ -125,9 +125,10 @@ private: double m_dCurrentWorldX; double m_dCurrentWorldY; double m_dTextAngle; + int m_iTextPointSize; bool m_bRecalcTransform; double m_dPointsPerPixel; // points (72pt/in) per screen pixel; - int m_iLinestyle; + int m_iLinestyle; // Master coordinates are coordinates before CTM transformation // World coordinates are coordinates defined by setWindow() @@ -145,6 +146,8 @@ private: #if HAVE_WXWINDOWS wxPen m_pen; wxFont* m_pFont; + + void initFromDC (wxDC* pDC); #endif public: @@ -175,7 +178,7 @@ public: static const unsigned char MARKER_BITMAP[MARK_COUNT][5]; SGP (const SGPDriver& driver); - ~SGP(); + ~SGP(); void drawCircle (const double r); void drawArc (const double r, double start, double stop);