// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dcpsg.h"
#endif
#include "wx/setup.h"
-#include "wx/window.h"
#include "wx/dcmemory.h"
#include "wx/utils.h"
#include "wx/intl.h"
-#include "wx/filedlg.h"
#include "wx/app.h"
-#include "wx/msgdlg.h"
#include "wx/image.h"
#include "wx/log.h"
#include "wx/generic/dcpsg.h"
-#include "wx/printdlg.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/radiobox.h"
-#include "wx/textctrl.h"
#include "wx/prntbase.h"
#include "wx/paper.h"
#include "wx/filefn.h"
+#if WXWIN_COMPATIBILITY_2_2
+ #include "wx/window.h"
+ #include "wx/printdlg.h"
+#endif
#include <math.h>
p1_x p1_y p2_x p2_y to_x to_y curveto\n\
} bind def\n\
";
-
+
static const char *wxPostScriptHeaderEllipse = "\
/ellipsedict 8 dict def\n\
ellipsedict /mtrx matrix put\n\
IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
-float wxPostScriptDC::ms_PSScaleFactor = 10.0;
+float wxPostScriptDC::ms_PSScaleFactor = 1.0;
void wxPostScriptDC::SetResolution(int ppi)
{
wxPrintData data;
data.SetFilename( output );
data.SetPrintMode( wxPRINT_MODE_FILE );
-
+
if (interactive)
{
wxPrintDialogData ddata( data );
}
data = dialog.GetPrintDialogData().GetPrintData();
}
-
+
return TRUE;
}
#endif
void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h)
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
if (m_clipping) DestroyClippingRegion();
wxDC::DoSetClippingRegion(x, y, w, h);
m_clipping = TRUE;
- fprintf( m_pstream,
+
+ if (m_pstream)
+ fprintf( m_pstream,
"gsave\n newpath\n"
"%d %d moveto\n"
"%d %d lineto\n"
void wxPostScriptDC::DestroyClippingRegion()
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
if (m_clipping)
{
m_clipping = FALSE;
- fprintf( m_pstream, "grestore\n" );
+ if ( m_pstream )
+ fprintf( m_pstream, "grestore\n" );
}
wxDC::DestroyClippingRegion();
void wxPostScriptDC::Clear()
{
- wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") );
+ // This should fail silently to avoid unnecessary
+ // asserts
+ // wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") );
}
bool wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (m_pen.GetStyle() == wxTRANSPARENT) return;
SetPen( m_pen );
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d moveto\n"
"%d %d lineto\n"
void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
wxCoord dx = x1 - xc;
wxCoord dy = y1 - yc;
{
SetBrush( m_brush );
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d %d %d %d %d ellipse\n"
"%d %d lineto\n"
{
SetPen( m_pen );
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d %d %d %d %d ellipse\n"
"%d %d lineto\n"
void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (sa>=360 || sa<=-360) sa=sa-int(sa/360)*360;
if (ea>=360 || ea<=-360) ea=ea-int(ea/360)*360;
{
SetBrush( m_brush );
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d %d %d %d %d true ellipticarc\n",
LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), (wxCoord)sa, (wxCoord)ea );
{
SetPen( m_pen );
- fprintf(m_pstream,
+ if ( m_pstream )
+ fprintf(m_pstream,
"newpath\n"
"%d %d %d %d %d %d false ellipticarc\n",
LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), (wxCoord)sa, (wxCoord)ea );
void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y)
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (m_pen.GetStyle() == wxTRANSPARENT) return;
SetPen (m_pen);
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d moveto\n"
"%d %d lineto\n"
CalcBoundingBox( x, y );
}
-void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int WXUNUSED(fillStyle))
+void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (n <= 0) return;
{
SetBrush( m_brush );
- fprintf( m_pstream, "newpath\n" );
+ if ( m_pstream )
+ fprintf( m_pstream, "newpath\n" );
wxCoord xx = LogicalToDeviceX(points[0].x + xoffset);
wxCoord yy = LogicalToDeviceY(points[0].y + yoffset);
- fprintf( m_pstream, "%d %d moveto\n", xx, yy );
+ if ( m_pstream )
+ fprintf( m_pstream, "%d %d moveto\n", xx, yy );
CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
xx = LogicalToDeviceX(points[i].x + xoffset);
yy = LogicalToDeviceY(points[i].y + yoffset);
- fprintf( m_pstream, "%d %d lineto\n", xx, yy );
+ if ( m_pstream )
+ fprintf( m_pstream, "%d %d lineto\n", xx, yy );
CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
}
- fprintf( m_pstream, "fill\n" );
+ if ( m_pstream )
+ fprintf( m_pstream, (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n"));
}
if (m_pen.GetStyle () != wxTRANSPARENT)
{
SetPen( m_pen );
- fprintf( m_pstream, "newpath\n" );
+ if ( m_pstream )
+ fprintf( m_pstream, "newpath\n" );
wxCoord xx = LogicalToDeviceX(points[0].x + xoffset);
wxCoord yy = LogicalToDeviceY(points[0].y + yoffset);
- fprintf( m_pstream, "%d %d moveto\n", xx, yy );
+ if ( m_pstream )
+ fprintf( m_pstream, "%d %d moveto\n", xx, yy );
CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset );
xx = LogicalToDeviceX(points[i].x + xoffset);
yy = LogicalToDeviceY(points[i].y + yoffset);
- fprintf( m_pstream, "%d %d lineto\n", xx, yy );
+ if ( m_pstream )
+ fprintf( m_pstream, "%d %d lineto\n", xx, yy );
CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset);
}
+ if ( m_pstream )
+ {
+ fprintf( m_pstream, "closepath\n" );
+ fprintf( m_pstream, "stroke\n" );
+ }
+ }
+}
+
+void wxPostScriptDC::DoDrawPolyPolygon (int n, int start[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+{
+ wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+
+ if (n <= 0) return;
+
+ if (m_brush.GetStyle () != wxTRANSPARENT)
+ {
+ SetBrush( m_brush );
+
+ fprintf( m_pstream, "newpath\n" );
+
+ int ofs = 0;
+ for (int i = 0; i < n; ofs += start[i++])
+ {
+ wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset);
+ wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset);
+
+ fprintf( m_pstream, "%d %d moveto\n", xx, yy );
+
+ CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
+
+ for (int j = 1; j < start[i]; j++)
+ {
+ xx = LogicalToDeviceX(points[ofs+j].x + xoffset);
+ yy = LogicalToDeviceY(points[ofs+j].y + yoffset);
+
+ fprintf( m_pstream, "%d %d lineto\n", xx, yy );
+
+ CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset);
+ }
+ }
+ fprintf( m_pstream, (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n"));
+ }
+
+ if (m_pen.GetStyle () != wxTRANSPARENT)
+ {
+ SetPen( m_pen );
+
+ fprintf( m_pstream, "newpath\n" );
+
+ int ofs = 0;
+ for (int i = 0; i < n; ofs += start[i++])
+ {
+ wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset);
+ wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset);
+
+ fprintf( m_pstream, "%d %d moveto\n", xx, yy );
+
+ CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset );
+
+ for (int j = 1; j < start[i]; j++)
+ {
+ xx = LogicalToDeviceX(points[ofs+j].x + xoffset);
+ yy = LogicalToDeviceY(points[ofs+j].y + yoffset);
+
+ fprintf( m_pstream, "%d %d lineto\n", xx, yy );
+
+ CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset);
+ }
+ }
fprintf( m_pstream, "closepath\n" );
fprintf( m_pstream, "stroke\n" );
}
void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (m_pen.GetStyle() == wxTRANSPARENT) return;
CalcBoundingBox( LogicalToDeviceX(points[i].x+xoffset), LogicalToDeviceY(points[i].y+yoffset));
}
- fprintf( m_pstream,
+ if ( m_pstream )
+ {
+ fprintf( m_pstream,
"newpath\n"
"%d %d moveto\n",
LogicalToDeviceX(points[0].x+xoffset), LogicalToDeviceY(points[0].y+yoffset) );
-
- for (i = 1; i < n; i++)
- {
- fprintf( m_pstream,
+
+ for (i = 1; i < n; i++)
+ {
+ fprintf( m_pstream,
"%d %d lineto\n",
LogicalToDeviceX(points[i].x+xoffset), LogicalToDeviceY(points[i].y+yoffset) );
+ }
+
+ fprintf( m_pstream, "stroke\n" );
}
-
- fprintf( m_pstream, "stroke\n" );
}
void wxPostScriptDC::DoDrawRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (m_brush.GetStyle () != wxTRANSPARENT)
{
SetBrush( m_brush );
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d moveto\n"
"%d %d lineto\n"
{
SetPen (m_pen);
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d moveto\n"
"%d %d lineto\n"
void wxPostScriptDC::DoDrawRoundedRectangle (wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (radius < 0.0)
{
// Now, a negative radius is interpreted to mean
// 'the proportion of the smallest X or Y dimension'
- double smallest = 0.0;
- if (width < height)
- smallest = width;
- else
- smallest = height;
+ double smallest = width < height ? width : height;
radius = (-radius * smallest);
}
SetBrush( m_brush );
/* Draw rectangle anticlockwise */
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d %d 90 180 arc\n"
"%d %d moveto\n"
SetPen (m_pen);
/* Draw rectangle anticlockwise */
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d %d 90 180 arc\n"
"%d %d moveto\n"
void wxPostScriptDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (m_brush.GetStyle () != wxTRANSPARENT)
{
SetBrush (m_brush);
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d %d %d 0 360 ellipse\n"
"fill\n",
{
SetPen (m_pen);
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d %d %d 0 360 ellipse\n"
"stroke\n",
void wxPostScriptDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (!bitmap.Ok()) return;
wxCoord xx = LogicalToDeviceX(x);
wxCoord yy = LogicalToDeviceY(y + bitmap.GetHeight());
- fprintf( m_pstream,
+ if ( m_pstream )
+ {
+ fprintf( m_pstream,
"/origstate save def\n"
"20 dict begin\n"
"/pix %d string def\n"
"{currentfile pix readhexstring pop}\n"
"false 3 colorimage\n",
w, w, xx, yy, ww, hh, w, h, w, -h, h );
-
-
- for (int j = 0; j < h; j++)
- {
- for (int i = 0; i < w; i++)
+
+ for (int j = 0; j < h; j++)
{
- char buffer[5];
- LocalDecToHex( image.GetRed(i,j), buffer );
- fprintf( m_pstream, buffer );
- LocalDecToHex( image.GetGreen(i,j), buffer );
- fprintf( m_pstream, buffer );
- LocalDecToHex( image.GetBlue(i,j), buffer );
- fprintf( m_pstream, buffer );
+ for (int i = 0; i < w; i++)
+ {
+ char buffer[5];
+ LocalDecToHex( image.GetRed(i,j), buffer );
+ fprintf( m_pstream, buffer );
+ LocalDecToHex( image.GetGreen(i,j), buffer );
+ fprintf( m_pstream, buffer );
+ LocalDecToHex( image.GetBlue(i,j), buffer );
+ fprintf( m_pstream, buffer );
+ }
+ fprintf( m_pstream, "\n" );
}
- fprintf( m_pstream, "\n" );
+ fprintf( m_pstream, "end\n" );
+ fprintf( m_pstream, "origstate restore\n" );
}
-
- fprintf( m_pstream, "end\n" );
- fprintf( m_pstream, "origstate restore\n" );
}
void wxPostScriptDC::SetFont( const wxFont& font )
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (!font.Ok()) return;
case wxSCRIPT:
{
name = "/ZapfChancery-MediumItalic";
- Style = wxNORMAL;
- Weight = wxNORMAL;
break;
}
case wxSWISS:
}
}
- fprintf( m_pstream, name );
- fprintf( m_pstream, " reencodeISO def\n" );
- fprintf( m_pstream, name );
- fprintf( m_pstream, " findfont\n" );
-
- char buffer[100];
- sprintf( buffer, "%f scalefont setfont\n", LogicalToDeviceYRel(m_font.GetPointSize() * 1000) / 1000.0F);
- // this is a hack - we must scale font size (in pts) according to m_scaleY but
- // LogicalToDeviceYRel works with wxCoord type (int or longint). Se we first convert font size
- // to 1/1000th of pt and then back.
- for (int i = 0; i < 100; i++)
- if (buffer[i] == ',') buffer[i] = '.';
- fprintf( m_pstream, buffer );
+ if ( m_pstream )
+ {
+ fprintf( m_pstream, name );
+ fprintf( m_pstream, " reencodeISO def\n" );
+ fprintf( m_pstream, name );
+ fprintf( m_pstream, " findfont\n" );
+
+ char buffer[100];
+ sprintf( buffer, "%f scalefont setfont\n", LogicalToDeviceYRel(m_font.GetPointSize() * 1000) / 1000.0F);
+ // this is a hack - we must scale font size (in pts) according to m_scaleY but
+ // LogicalToDeviceYRel works with wxCoord type (int or longint). Se we first convert font size
+ // to 1/1000th of pt and then back.
+ for (int i = 0; i < 100; i++)
+ if (buffer[i] == ',') buffer[i] = '.';
+ fprintf( m_pstream, buffer );
+ }
#endif
}
void wxPostScriptDC::SetPen( const wxPen& pen )
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (!pen.Ok()) return;
m_pen = pen;
+ if ( m_pstream )
{
char buffer[100];
#ifdef __WXMSW__
static const char *wxCoord_dashed = "[4 8] 2";
static const char *dotted_dashed = "[6 6 2 6] 4";
- const char *psdash = (char *) NULL;
+ const char *psdash;
+
switch (m_pen.GetStyle())
{
case wxDOT: psdash = dotted; break;
default: psdash = "[] 0"; break;
}
- if (oldStyle != m_pen.GetStyle())
+ if ((oldStyle != m_pen.GetStyle()) && m_pstream )
{
fprintf( m_pstream, psdash );
fprintf( m_pstream," setdash\n" );
double redPS = (double)(red) / 255.0;
double bluePS = (double)(blue) / 255.0;
double greenPS = (double)(green) / 255.0;
-
+
char buffer[100];
sprintf( buffer,
- "%.8f %.8f %.8f setrgbcolor\n",
- redPS, greenPS, bluePS );
+ "%.8f %.8f %.8f setrgbcolor\n",
+ redPS, greenPS, bluePS );
for (int i = 0; i < 100; i++)
if (buffer[i] == ',') buffer[i] = '.';
- fprintf( m_pstream, buffer );
+ if ( m_pstream )
+ fprintf( m_pstream, buffer );
+
m_currentRed = red;
m_currentBlue = blue;
m_currentGreen = green;
void wxPostScriptDC::SetBrush( const wxBrush& brush )
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (!brush.Ok()) return;
redPS, greenPS, bluePS );
for (int i = 0; i < 100; i++)
if (buffer[i] == ',') buffer[i] = '.';
- fprintf( m_pstream, buffer );
+
+ if ( m_pstream )
+ fprintf( m_pstream, buffer );
m_currentRed = red;
m_currentBlue = blue;
OutlineInfo *outline_info = (OutlineInfo*)user_data;
fprintf(outline_info->file,
"%d %d %d %d %d %d curveto\n",
- (int)control1->x ,
+ (int)control1->x ,
(int)control1->y ,
(int)control2->x ,
(int)control2->y ,
FT_UInt glyph_index,
int pos_x,
int pos_y,
- int scale_x,
- int scale_y )
+ double scale_x,
+ double scale_y )
{
FT_Int load_flags = FT_LOAD_NO_BITMAP;
FT_Glyph glyph;
- FT_Outline_Funcs outlinefunc =
+ FT_Outline_Funcs outlinefunc =
{
paps_move_to,
paps_line_to,
paps_conic_to,
paps_cubic_to
};
-
+
OutlineInfo outline_info;
outline_info.file = file;
fprintf(file, "gsave\n");
fprintf(file, "%d %d translate\n", pos_x, pos_y );
- // FT2 scales outlines to 26.6 pixels so the code below
- // should read 26600 instead of the 60000.
- fprintf(file, "%d 60000 div %d 60000 div scale\n", scale_x, scale_y );
- fprintf(file, "0 0 0 setrgbcolor\n");
+
+ // We have to replace the "," from the German
+ // locale with the Englich "." for PostScript
+ char buf[100];
+ sprintf(buf, "%.8f %.8f scale\n", scale_x, scale_y );
+ for (size_t i = 0; i < strlen(buf); i++)
+ if (buf[i] == ',') buf[i] = '.';
+ fprintf(file, buf);
FT_Load_Glyph(face, glyph_index, load_flags);
FT_Get_Glyph (face->glyph, &glyph);
FT_Outline_Decompose (&(((FT_OutlineGlyph)glyph)->outline),
&outlinefunc, &outline_info);
- fprintf(file, "closepath fill grestore \n");
-
+ fprintf(file, "closepath fill grestore\n");
+
FT_Done_Glyph (glyph);
}
void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
+
+ if (m_textForegroundColour.Ok())
+ {
+ unsigned char red = m_textForegroundColour.Red();
+ unsigned char blue = m_textForegroundColour.Blue();
+ unsigned char green = m_textForegroundColour.Green();
+
+ if (!m_colour)
+ {
+ // Anything not white is black
+ if (! (red == (unsigned char) 255 &&
+ blue == (unsigned char) 255 &&
+ green == (unsigned char) 255))
+ {
+ red = (unsigned char) 0;
+ green = (unsigned char) 0;
+ blue = (unsigned char) 0;
+ }
+ }
+
+ // maybe setgray here ?
+ if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
+ {
+ double redPS = (double)(red) / 255.0;
+ double bluePS = (double)(blue) / 255.0;
+ double greenPS = (double)(green) / 255.0;
+
+ char buffer[100];
+ sprintf( buffer,
+ "%.8f %.8f %.8f setrgbcolor\n",
+ redPS, greenPS, bluePS );
+ for (size_t i = 0; i < strlen(buffer); i++)
+ if (buffer[i] == ',') buffer[i] = '.';
+ if ( m_pstream )
+ fprintf( m_pstream, buffer );
+
+ m_currentRed = red;
+ m_currentBlue = blue;
+ m_currentGreen = green;
+ }
+ }
#if wxUSE_PANGO
- int dpi = GetResolution();
- dpi = 300;
- PangoContext *context = pango_ft2_get_context ( dpi, dpi );
+ int ps_dpi = 72;
+ int pango_dpi = 600;
+ PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );
+
+ double scale = (double)pango_dpi / (double)ps_dpi;
+ scale /= m_userScaleY;
pango_context_set_language (context, pango_language_from_string ("en_US"));
pango_context_set_base_dir (context, PANGO_DIRECTION_LTR );
#endif
pango_layout_set_text( layout, (const char*) buffer, strlen(buffer) );
+ if ( m_pstream )
+ fprintf( m_pstream, "%%%% %s\n", (const char*)buffer );
+
PangoRectangle rect;
pango_layout_get_extents(layout, NULL, &rect);
-
- int xx = x * PANGO_SCALE;
- int yy = y * PANGO_SCALE + (rect.height*2/3);
-
- int scale_x = LogicalToDeviceXRel( 1000 );
- int scale_y = LogicalToDeviceYRel( 1000 );
-
+
+ int xx = LogicalToDeviceX( x );
+ int yy = LogicalToDeviceY( y );
+
+ int xxx = xx * PANGO_SCALE;
+ int yyy = yy * PANGO_SCALE - (int)(rect.height * 0.66 / scale); // Move down by estimated baseline. HACK.
+
+#define ps_kludge_factor 2.8
+
// Loop over lines in layout
int num_lines = pango_layout_get_line_count( layout );
for (int i = 0; i < num_lines; i++)
{
PangoLayoutLine *line = pango_layout_get_line( layout, i );
-
+
+ // width of glyphs already printed
+ int all_width = 0;
+
// Loop over runs in line
GSList *runs_list = line->runs;
while (runs_list)
PangoAnalysis *analysis = &item->analysis;
PangoFont *font = analysis->font;
FT_Face ft_face = pango_ft2_font_get_face(font);
-
+
int num_glyphs = glyphs->num_glyphs;
for (int glyph_idx = 0; glyph_idx < num_glyphs; glyph_idx++)
{
PangoGlyphGeometry geometry = glyphs->glyphs[glyph_idx].geometry;
- int pos_x = xx + geometry.x_offset;
- int pos_y = yy - geometry.y_offset;
- xx += geometry.width;
-
- draw_bezier_outline( m_pstream, ft_face,
- (FT_UInt)(glyphs->glyphs[glyph_idx].glyph),
- LogicalToDeviceX( pos_x / PANGO_SCALE ),
- LogicalToDeviceY( pos_y / PANGO_SCALE ),
- scale_x, scale_y );
+ int pos_x = xxx + (int)((double)(all_width+geometry.x_offset) / scale);
+ int pos_y = yyy + (int)((double)geometry.y_offset / scale );
+ all_width += geometry.width;
+
+ if ( m_pstream )
+ draw_bezier_outline( m_pstream, ft_face,
+ (FT_UInt)(glyphs->glyphs[glyph_idx].glyph),
+ pos_x / PANGO_SCALE,
+ pos_y / PANGO_SCALE,
+ 1.0/(ps_kludge_factor * scale * 26.6),
+ 1.0/(ps_kludge_factor * scale * 26.6) );
}
runs_list = runs_list->next;
}
}
g_object_unref( G_OBJECT( layout ) );
+ g_object_unref( G_OBJECT( context ) );
#else
wxCoord text_w, text_h, text_descent;
// doesn't create any problems, remove this comment entirely
//SetFont( m_font );
- if (m_textForegroundColour.Ok())
- {
- unsigned char red = m_textForegroundColour.Red();
- unsigned char blue = m_textForegroundColour.Blue();
- unsigned char green = m_textForegroundColour.Green();
-
- if (!m_colour)
- {
- // Anything not white is black
- if (! (red == (unsigned char) 255 &&
- blue == (unsigned char) 255 &&
- green == (unsigned char) 255))
- {
- red = (unsigned char) 0;
- green = (unsigned char) 0;
- blue = (unsigned char) 0;
- }
- }
-
- // maybe setgray here ?
- if (!(red == m_currentRed && green == m_currentGreen && blue == m_currentBlue))
- {
- double redPS = (double)(red) / 255.0;
- double bluePS = (double)(blue) / 255.0;
- double greenPS = (double)(green) / 255.0;
-
- char buffer[100];
- sprintf( buffer,
- "%.8f %.8f %.8f setrgbcolor\n",
- redPS, greenPS, bluePS );
- for (int i = 0; i < 100; i++)
- if (buffer[i] == ',') buffer[i] = '.';
- fprintf( m_pstream, buffer );
-
- m_currentRed = red;
- m_currentBlue = blue;
- m_currentGreen = green;
- }
- }
int size = m_font.GetPointSize();
// commented by V. Slavik and replaced by accurate version
// - note that there is still rounding error in text_descent!
wxCoord by = y + size - text_descent; // baseline
- fprintf( m_pstream, "%d %d moveto\n", LogicalToDeviceX(x), LogicalToDeviceY(by) );
-
- fprintf( m_pstream, "(" );
- const wxWX2MBbuf textbuf = text.mb_str();
- size_t len = strlen(textbuf);
- size_t i;
- for (i = 0; i < len; i++)
+ if ( m_pstream )
{
- int c = (unsigned char) textbuf[i];
- if (c == ')' || c == '(' || c == '\\')
- {
- /* Cope with special characters */
- fprintf( m_pstream, "\\" );
- fputc(c, m_pstream);
- }
- else if ( c >= 128 )
+ fprintf( m_pstream, "%d %d moveto\n", LogicalToDeviceX(x), LogicalToDeviceY(by) );
+ fprintf( m_pstream, "(" );
+
+ const wxWX2MBbuf textbuf = text.mb_str();
+ size_t len = strlen(textbuf);
+ size_t i;
+ for (i = 0; i < len; i++)
{
- /* Cope with character codes > 127 */
- fprintf(m_pstream, "\\%o", c);
+ int c = (unsigned char) textbuf[i];
+ if (c == ')' || c == '(' || c == '\\')
+ {
+ /* Cope with special characters */
+ fprintf( m_pstream, "\\" );
+ fputc(c, m_pstream);
+ }
+ else if ( c >= 128 )
+ {
+ /* Cope with character codes > 127 */
+ fprintf(m_pstream, "\\%o", c);
+ }
+ else
+ {
+ fputc(c, m_pstream);
+ }
}
- else
+
+ fprintf( m_pstream, ") show\n" );
+
+ if (m_font.GetUnderlined())
{
- fputc(c, m_pstream);
- }
- }
-
- fprintf( m_pstream, ") show\n" );
-
- if (m_font.GetUnderlined())
- {
- wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
- char buffer[100];
-
- sprintf( buffer,
+ wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
+ char buffer[100];
+
+ sprintf( buffer,
"gsave\n"
"%d %d moveto\n"
"%f setlinewidth\n"
LogicalToDeviceX(x), LogicalToDeviceY(uy),
m_underlineThickness,
LogicalToDeviceX(x + text_w), LogicalToDeviceY(uy) );
- for (i = 0; i < 100; i++)
- if (buffer[i] == ',') buffer[i] = '.';
- fprintf( m_pstream, buffer );
+ for (i = 0; i < 100; i++)
+ if (buffer[i] == ',') buffer[i] = '.';
+ fprintf( m_pstream, buffer );
+ }
}
CalcBoundingBox( x, y );
return;
}
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
SetFont( m_font );
redPS, greenPS, bluePS );
for (int i = 0; i < 100; i++)
if (buffer[i] == ',') buffer[i] = '.';
- fprintf( m_pstream, buffer );
+ if ( m_pstream )
+ fprintf( m_pstream, buffer );
m_currentRed = red;
m_currentBlue = blue;
int size = m_font.GetPointSize();
- long by = y + (long)floor( double(size) * 2.0 / 3.0 ); // approximate baseline
-
- // FIXME only correct for 90 degrees
- fprintf(m_pstream, "%d %d moveto\n",
- LogicalToDeviceX((wxCoord)(x + size)), LogicalToDeviceY((wxCoord)by) );
-
- char buffer[100];
- sprintf(buffer, "%.8f rotate\n", angle);
- size_t i;
- for (i = 0; i < 100; i++)
- if (buffer[i] == ',') buffer[i] = '.';
- fprintf(m_pstream, buffer);
-
- fprintf( m_pstream, "(" );
- const wxWX2MBbuf textbuf = text.mb_str();
- size_t len = strlen(textbuf);
- for (i = 0; i < len; i++)
+ if ( m_pstream )
{
- int c = (unsigned char) textbuf[i];
- if (c == ')' || c == '(' || c == '\\')
- {
- /* Cope with special characters */
- fprintf( m_pstream, "\\" );
- fputc(c, m_pstream);
- }
- else if ( c >= 128 )
+ fprintf(m_pstream, "%d %d moveto\n",
+ LogicalToDeviceX(x), LogicalToDeviceY(y));
+
+ char buffer[100];
+ sprintf(buffer, "%.8f rotate\n", angle);
+ size_t i;
+ for (i = 0; i < 100; i++)
{
- /* Cope with character codes > 127 */
- fprintf(m_pstream, "\\%o", c);
+ if (buffer[i] == ',') buffer[i] = '.';
}
- else
+ fprintf(m_pstream, buffer);
+
+ fprintf( m_pstream, "(" );
+ const wxWX2MBbuf textbuf = text.mb_str();
+ size_t len = strlen(textbuf);
+ for (i = 0; i < len; i++)
{
- fputc(c, m_pstream);
+ int c = (unsigned char) textbuf[i];
+ if (c == ')' || c == '(' || c == '\\')
+ {
+ /* Cope with special characters */
+ fprintf( m_pstream, "\\" );
+ fputc(c, m_pstream);
+ }
+ else if ( c >= 128 )
+ {
+ /* Cope with character codes > 127 */
+ fprintf(m_pstream, "\\%o", c);
+ }
+ else
+ {
+ fputc(c, m_pstream);
+ }
}
- }
-
- fprintf( m_pstream, ") show\n" );
-
- sprintf( buffer, "%.8f rotate\n", -angle );
- for (i = 0; i < 100; i++)
- if (buffer[i] == ',') buffer[i] = '.';
- fprintf( m_pstream, buffer );
-
- if (m_font.GetUnderlined())
- {
- wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
- wxCoord w, h;
- char buffer[100];
- GetTextExtent(text, &w, &h);
-
- sprintf( buffer,
- "gsave\n"
- "%d %d moveto\n"
- "%f setlinewidth\n"
- "%d %d lineto\n"
- "stroke\n"
- "grestore\n",
- LogicalToDeviceX(x), LogicalToDeviceY(uy),
- m_underlineThickness,
- LogicalToDeviceX(x + w), LogicalToDeviceY(uy) );
+
+ fprintf( m_pstream, ") show\n" );
+
+ sprintf( buffer, "%.8f rotate\n", -angle );
for (i = 0; i < 100; i++)
+ {
if (buffer[i] == ',') buffer[i] = '.';
+ }
fprintf( m_pstream, buffer );
+
+ if (m_font.GetUnderlined())
+ {
+ wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
+ wxCoord w, h;
+ char buffer[100];
+ GetTextExtent(text, &w, &h);
+
+ sprintf( buffer,
+ "gsave\n"
+ "%d %d moveto\n"
+ "%f setlinewidth\n"
+ "%d %d lineto\n"
+ "stroke\n"
+ "grestore\n",
+ LogicalToDeviceX(x), LogicalToDeviceY(uy),
+ m_underlineThickness,
+ LogicalToDeviceX(x + w), LogicalToDeviceY(uy) );
+ for (i = 0; i < 100; i++)
+ {
+ if (buffer[i] == ',') buffer[i] = '.';
+ }
+ fprintf( m_pstream, buffer );
+ }
}
-
+
CalcBoundingBox( x, y );
CalcBoundingBox( x + size * text.Length() * 2/3 , y );
}
void wxPostScriptDC::DoDrawSpline( wxList *points )
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
SetPen( m_pen );
- double a, b, c, d, x1, y1, x2, y2, x3, y3;
+ // a and b are not used
+ //double a, b;
+ double c, d, x1, y1, x2, y2, x3, y3;
wxPoint *p, *q;
- wxNode *node = points->First();
- p = (wxPoint *)node->Data();
+ wxList::compatibility_iterator node = points->GetFirst();
+ p = (wxPoint *)node->GetData();
x1 = p->x;
y1 = p->y;
- node = node->Next();
- p = (wxPoint *)node->Data();
+ node = node->GetNext();
+ p = (wxPoint *)node->GetData();
c = p->x;
d = p->y;
- x3 = a = (double)(x1 + c) / 2;
- y3 = b = (double)(y1 + d) / 2;
-
- fprintf( m_pstream,
+ x3 =
+ #if 0
+ a =
+ #endif
+ (double)(x1 + c) / 2;
+ y3 =
+ #if 0
+ b =
+ #endif
+ (double)(y1 + d) / 2;
+
+ if ( m_pstream )
+ fprintf( m_pstream,
"newpath\n"
"%d %d moveto\n"
"%d %d lineto\n",
CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
- while ((node = node->Next()) != NULL)
+ node = node->GetNext();
+ while (node)
{
- q = (wxPoint *)node->Data();
+ q = (wxPoint *)node->GetData();
x1 = x3;
y1 = y3;
x3 = (double)(x2 + c) / 2;
y3 = (double)(y2 + d) / 2;
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"%d %d %d %d %d %d DrawSplineSection\n",
LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1),
LogicalToDeviceX((wxCoord)x2), LogicalToDeviceY((wxCoord)y2),
CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
+
+ node = node->GetNext();
}
/*
next-to-last and last point respectively, in the point list
*/
- fprintf( m_pstream,
+ if ( m_pstream )
+ fprintf( m_pstream,
"%d %d lineto\n"
"stroke\n",
LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) );
void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
m_signX = (xLeftRight ? 1 : -1);
m_signY = (yBottomUp ? 1 : -1);
void wxPostScriptDC::SetDeviceOrigin( wxCoord x, wxCoord y )
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
int h = 0;
int w = 0;
fprintf( m_pstream, "%%%%Orientation: Landscape\n" );
else
fprintf( m_pstream, "%%%%Orientation: Portrait\n" );
-
+
// fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) );
-
- char *paper = "A4";
+
+ const char *paper;
switch (m_printData.GetPaperId())
{
case wxPAPER_LETTER: paper = "Letter"; break; // Letter: paper ""; 8 1/2 by 11 inches
fclose( m_pstream );
m_pstream = (FILE *) NULL;
-#if 0
+#if 0
// THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe <andy@hyperparallel.com>
wxCoord wx_printer_translate_x, wx_printer_translate_y;
double wx_printer_scale_x, wx_printer_scale_y;
#endif
#if defined(__X__) || defined(__WXGTK__)
- if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))
+ if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))
{
wxString command;
command += m_printData.GetPrinterCommand();
command += wxT(" ");
+ command += m_printData.GetPrinterOptions();
+ command += wxT(" ");
command += m_printData.GetFilename();
wxExecute( command, TRUE );
void wxPostScriptDC::StartPage()
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- fprintf( m_pstream, "%%%%Page: %d\n", wxPageNumber++ );
+ if ( m_pstream )
+ fprintf( m_pstream, "%%%%Page: %d\n", wxPageNumber++ );
// What is this one supposed to do? RR.
// *m_pstream << "matrix currentmatrix\n";
int h;
GetSize( (int*) NULL, &h );
translate_y -= h;
- fprintf( m_pstream, "90 rotate\n" );
+ if ( m_pstream )
+ {
+ fprintf( m_pstream, "90 rotate\n" );
- // I copied this one from a PostScript tutorial, but to no avail. RR.
- // fprintf( m_pstream, "90 rotate llx neg ury nef translate\n" );
+ // I copied this one from a PostScript tutorial, but to no avail. RR.
+ // fprintf( m_pstream, "90 rotate llx neg ury nef translate\n" );
+ }
}
- char buffer[100];
- sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor,
- scale_y / ms_PSScaleFactor);
- for (int i = 0; i < 100; i++)
- if (buffer[i] == ',') buffer[i] = '.';
- fprintf( m_pstream, buffer );
-
- fprintf( m_pstream, "%d %d translate\n", translate_x, translate_y );
+ if ( m_pstream )
+ {
+ char buffer[100];
+ sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor,
+ scale_y / ms_PSScaleFactor);
+ for (int i = 0; i < 100; i++)
+ if (buffer[i] == ',') buffer[i] = '.';
+ fprintf( m_pstream, buffer );
+
+ fprintf( m_pstream, "%d %d translate\n", translate_x, translate_y );
+ }
}
void wxPostScriptDC::EndPage ()
{
- wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
+ wxCHECK_RET( m_ok , wxT("invalid postscript dc") );
- fprintf( m_pstream, "showpage\n" );
+ if ( m_pstream )
+ fprintf( m_pstream, "showpage\n" );
}
bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest,
wxCoord xsrc, wxCoord ysrc,
int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
{
- wxCHECK_MSG( m_ok && m_pstream, FALSE, wxT("invalid postscript dc") );
+ wxCHECK_MSG( m_ok, FALSE, wxT("invalid postscript dc") );
wxCHECK_MSG( source, FALSE, wxT("invalid source dc") );
{
if (x) (*x) = 0;
if (y) (*y) = 0;
+ if (descent) (*descent) = 0;
+ if (externalLeading) (*externalLeading) = 0;
return;
}
-
+
#if wxUSE_PANGO
- int dpi = GetResolution();
- PangoContext *context = pango_ft2_get_context ( dpi, dpi );
-
+ int wx_dpi = GetResolution();
+ int pango_dpi = 600;
+ PangoContext *context = pango_ft2_get_context ( pango_dpi, pango_dpi );
+
+ double scale = pango_dpi / wx_dpi;
+ scale /= m_userScaleY;
+
pango_context_set_language (context, pango_language_from_string ("en_US"));
pango_context_set_base_dir (context, PANGO_DIRECTION_LTR );
PangoLayout *layout = pango_layout_new (context);
-
+
PangoFontDescription *desc = fontToUse->GetNativeFontInfo()->description;
pango_layout_set_font_description(layout, desc);
#if wxUSE_UNICODE
- const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
- pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+ const wxCharBuffer data = wxConvUTF8.cWC2MB( string );
#else
- const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
- const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
- pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
+ const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string );
+ const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata );
#endif
+ pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
-
+
PangoRectangle rect;
pango_layout_line_get_extents(line, NULL, &rect);
-
- if (x) (*x) = (wxCoord) ( m_scaleX * rect.width / PANGO_SCALE );
- if (y) (*y) = (wxCoord) ( m_scaleY * rect.height / PANGO_SCALE );
+
+ if (x) (*x) = (wxCoord) ( rect.width / PANGO_SCALE / scale );
+ if (y) (*y) = (wxCoord) ( rect.height / PANGO_SCALE / scale );
if (descent)
{
// Do something about metrics here
(*descent) = 0;
}
if (externalLeading) (*externalLeading) = 0; // ??
-
+
g_object_unref( G_OBJECT( layout ) );
#else
// GTK 2.0
lastStyle = Style;
lastWeight = Weight;
- const wxChar *name = NULL;
+ const wxChar *name;
switch (Family)
{
case wxSCRIPT:
{
name = wxT("Zapf.afm");
- Style = wxNORMAL;
- Weight = wxNORMAL;
+ break;
}
case wxSWISS:
default:
}
FILE *afmFile = NULL;
-
+
// Get the directory of the AFM files
wxString afmName;
if (!m_printData.GetFontMetricPath().IsEmpty())
/ the correct way would be to map the character names
/ like 'adieresis' to corresp. positions of ISOEnc and read
/ these values from AFM files, too. Maybe later ... */
- lastWidths[196] = lastWidths['A']; // Ä
- lastWidths[228] = lastWidths['a']; // ä
- lastWidths[214] = lastWidths['O']; // Ö
- lastWidths[246] = lastWidths['o']; // ö
- lastWidths[220] = lastWidths['U']; // Ü
- lastWidths[252] = lastWidths['u']; // ü
- lastWidths[223] = lastWidths[251]; // ß
+
+ // NB: casts to int are needed to suppress gcc 3.3 warnings
+ lastWidths[196] = lastWidths[(int)'A']; // Ä
+ lastWidths[228] = lastWidths[(int)'a']; // ä
+ lastWidths[214] = lastWidths[(int)'O']; // Ö
+ lastWidths[246] = lastWidths[(int)'o']; // ö
+ lastWidths[220] = lastWidths[(int)'U']; // Ü
+ lastWidths[252] = lastWidths[(int)'u']; // ü
+ lastWidths[223] = lastWidths[(int)251]; // ß
/* JC: calculate UnderlineThickness/UnderlinePosition */
if(lastWidths[*p]== INT_MIN)
{
wxLogDebug(wxT("GetTextExtent: undefined width for character '%c' (%d)"), *p,*p);
- sum += lastWidths[' ']; /* assume space */
+ sum += lastWidths[(unsigned char)' ']; /* assume space */
}
else
{
projects / wxWidgets.git / blobdiff