X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fsgp.h;h=611654ef81b530562ccd8d6c6786758841c8f6b6;hp=36b3b759db29c7dae3469a5f729d9dd64accd72c;hb=23f5654dacb1952c15bda92c2606fae3a55e48ad;hpb=dc034c9d0b7d9c3874a324a4c2c189a02945adc8 diff --git a/include/sgp.h b/include/sgp.h index 36b3b75..611654e 100644 --- a/include/sgp.h +++ b/include/sgp.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: sgp.h,v 1.22 2000/12/16 06:12:47 kevin Exp $ +** $Id: sgp.h,v 1.25 2001/01/04 21:28:41 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,8 +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; // Master coordinates are coordinates before CTM transformation // World coordinates are coordinates defined by setWindow() @@ -143,7 +145,9 @@ private: #if HAVE_WXWINDOWS wxPen m_pen; - wxFont m_font; + wxFont* m_pFont; + + void initFromDC (wxDC* pDC); #endif public: @@ -174,6 +178,7 @@ public: static const unsigned char MARKER_BITMAP[MARK_COUNT][5]; SGP (const SGPDriver& driver); + ~SGP(); void drawCircle (const double r); void drawArc (const double r, double start, double stop);