From 777ee1b8223d3ae17baf0b26d8fde4d7db5ac119 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Sat, 5 Feb 2011 13:54:56 +0000 Subject: Removed global variables fl_font_ and fl_size_ that are now distinct for each graphics device. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8374 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_PostScript.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/Fl_PostScript.cxx') diff --git a/src/Fl_PostScript.cxx b/src/Fl_PostScript.cxx index aecfe9af8..178d2b479 100644 --- a/src/Fl_PostScript.cxx +++ b/src/Fl_PostScript.cxx @@ -589,15 +589,14 @@ int Fl_PostScript_Graphics_Driver::start_postscript (int pagecount, void Fl_PostScript_Graphics_Driver::recover(){ color(cr_,cg_,cb_); line_style(linestyle_,linewidth_,linedash_); - font(font_,size_); + font(Fl_Graphics_Driver::font(), Fl_Graphics_Driver::size()); } void Fl_PostScript_Graphics_Driver::reset(){ gap_=1; clip_=0; cr_=cg_=cb_=0; - font_=FL_HELVETICA; - size_=12; + Fl_Graphics_Driver::font(FL_HELVETICA, 12); linewidth_=0; linestyle_=FL_SOLID; strcpy(linedash_,""); @@ -932,7 +931,7 @@ void Fl_PostScript_Graphics_Driver::font(int f, int s) { fprintf(output, "/%s SF\n" , _fontNames[f]); fprintf(output,"%i FS\n", s); Fl_Display_Device::display_device()->driver()->font(f,s); // Use display fonts for font measurement - font_ = f; size_ = s; + Fl_Graphics_Driver::font(f, s); } void Fl_PostScript_Graphics_Driver::color(Fl_Color c) { -- cgit v1.2.3