#include "wx/prntbase.h"
#include "wx/generic/prntdlgg.h"
#include "wx/paper.h"
-#include "wx/filefn.h"
+#include "wx/filename.h"
#include "wx/stdpaths.h"
#ifdef __WXMSW__
} ifelse % end of 'false' case\n\
";
-static char wxPostScriptHeaderReencodeISO1[] =
+static const char wxPostScriptHeaderReencodeISO1[] =
"\n/reencodeISO {\n"
"dup dup findfont dup length dict begin\n"
"{ 1 index /FID ne { def }{ pop pop } ifelse } forall\n"
"/.notdef/dotlessi/grave/acute/circumflex/tilde/macron/breve\n"
"/dotaccent/dieresis/.notdef/ring/cedilla/.notdef/hungarumlaut\n";
-static char wxPostScriptHeaderReencodeISO2[] =
+static const char wxPostScriptHeaderReencodeISO2[] =
"/ogonek/caron/space/exclamdown/cent/sterling/currency/yen/brokenbar\n"
"/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot\n"
"/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior\n"
void wxPostScriptDCImpl::Init()
{
- m_pstream = (FILE*) NULL;
+ m_pstream = NULL;
m_currentRed = 0;
m_currentGreen = 0;
if (m_pstream)
{
fclose( m_pstream );
- m_pstream = (FILE*) NULL;
+ m_pstream = NULL;
}
}
return m_ok;
}
-wxRect wxPostScriptDCImpl::GetPaperRect()
+wxRect wxPostScriptDCImpl::GetPaperRect() const
{
int w = 0;
int h = 0;
return wxRect(0,0,w,h);
}
-int wxPostScriptDCImpl::GetResolution()
+int wxPostScriptDCImpl::GetResolution() const
{
return DPI;
}
// wxFAIL_MSG( wxT("wxPostScriptDCImpl::Clear not implemented.") );
}
-bool wxPostScriptDCImpl::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
+bool wxPostScriptDCImpl::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), wxFloodFillStyle WXUNUSED(style))
{
wxFAIL_MSG( wxT("wxPostScriptDCImpl::FloodFill not implemented.") );
return false;
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (m_pen.GetStyle() == wxTRANSPARENT) return;
+ if ( m_pen.IsTransparent() )
+ return;
SetPen( m_pen );
int i_radius = wxRound( radius );
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
CalcBoundingBox( xc+i_radius, yc+i_radius );
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen( m_pen );
wxString buffer;
buffer.Printf( "newpath\n"
"%f %f %f %f %f %f ellipse\n"
- "%f %f lineto\n"
- "closepath\n"
"stroke\n",
XLOG2DEV(xc), YLOG2DEV(yc),
XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius),
- alpha1, alpha2,
- XLOG2DEV(xc), YLOG2DEV(yc) );
+ alpha1, alpha2 );
buffer.Replace( ",", "." );
PsPrint( buffer );
return;
}
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
CalcBoundingBox( x+w, y+h );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen( m_pen );
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (m_pen.GetStyle() == wxTRANSPARENT) return;
+ if ( m_pen.IsTransparent() )
+ return;
SetPen (m_pen);
CalcBoundingBox( x, y );
}
-void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (n <= 0) return;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen( m_pen );
}
}
-void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
if (n <= 0) return;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen( m_pen );
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (m_pen.GetStyle() == wxTRANSPARENT) return;
+ if ( m_pen.IsTransparent() )
+ return;
if (n <= 0) return;
width--;
height--;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
CalcBoundingBox( x + width, y + height );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
wxCoord rad = (wxCoord) radius;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush( m_brush );
CalcBoundingBox( x + width, y + height );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
width--;
height--;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if ( m_brush.IsNonTransparent() )
{
SetBrush (m_brush);
CalcBoundingBox( x + width, y + height );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if ( m_pen.IsNonTransparent() )
{
SetPen (m_pen);
}
/* this has to be char, not wxChar */
-static char hexArray[] = "0123456789ABCDEF";
+static const char hexArray[] = "0123456789ABCDEF";
void wxPostScriptDCImpl::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool WXUNUSED(useMask) )
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (!bitmap.Ok()) return;
+ if (!bitmap.IsOk()) return;
wxImage image = bitmap.ConvertToImage();
- if (!image.Ok()) return;
+ if (!image.IsOk()) return;
wxCoord w = image.GetWidth();
wxCoord h = image.GetHeight();
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (!font.Ok()) return;
+ if (!font.IsOk()) return;
m_font = font;
PsPrint( " findfont\n" );
- double size = (double) m_font.GetPointSize();
+ float size = float(m_font.GetPointSize());
+ size = size * GetFontPointSizeAdjustment(DPI);
wxString buffer;
- buffer.Printf( "%f scalefont setfont\n", size * DEV2PS * m_scaleX );
+ buffer.Printf( "%f scalefont setfont\n", size * m_scaleX );
buffer.Replace( ",", "." );
PsPrint( buffer );
}
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (!pen.Ok()) return;
+ if (!pen.IsOk()) return;
int oldStyle = m_pen.GetStyle();
switch (m_pen.GetStyle())
{
- case wxDOT: psdash = dotted; break;
- case wxSHORT_DASH: psdash = short_dashed; break;
- case wxLONG_DASH: psdash = wxCoord_dashed; break;
- case wxDOT_DASH: psdash = dotted_dashed; break;
- case wxUSER_DASH:
+ case wxPENSTYLE_DOT: psdash = dotted; break;
+ case wxPENSTYLE_SHORT_DASH: psdash = short_dashed; break;
+ case wxPENSTYLE_LONG_DASH: psdash = wxCoord_dashed; break;
+ case wxPENSTYLE_DOT_DASH: psdash = dotted_dashed; break;
+ case wxPENSTYLE_USER_DASH:
{
wxDash *dashes;
int nDashes = m_pen.GetDashes (&dashes);
psdash = 0;
}
break;
- case wxSOLID:
- case wxTRANSPARENT:
+ case wxPENSTYLE_SOLID:
+ case wxPENSTYLE_TRANSPARENT:
default: psdash = "[] 0"; break;
}
double bluePS = (double)(blue) / 255.0;
double greenPS = (double)(green) / 255.0;
- wxString buffer;
buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS );
buffer.Replace( ",", "." );
PsPrint( buffer );
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (!brush.Ok()) return;
+ if (!brush.IsOk()) return;
m_brush = brush;
if ( !textbuf )
return;
- if (m_textForegroundColour.Ok())
+ if (m_textForegroundColour.IsOk())
{
unsigned char red = m_textForegroundColour.Red();
unsigned char blue = m_textForegroundColour.Blue();
PsPrint( buffer );
PsPrint( "(" );
- size_t len = strlen(textbuf);
- size_t i;
- for (i = 0; i < len; i++)
+ for ( const char *p = textbuf; *p != '\0'; p++ )
{
- int c = (unsigned char) textbuf[i];
+ int c = (unsigned char)*p;
if (c == ')' || c == '(' || c == '\\')
{
/* Cope with special characters */
SetFont( m_font );
- if (m_textForegroundColour.Ok())
+ if (m_textForegroundColour.IsOk())
{
unsigned char red = m_textForegroundColour.Red();
unsigned char blue = m_textForegroundColour.Blue();
PsPrint( "(" );
const wxWX2MBbuf textbuf = text.mb_str();
- size_t len = strlen(textbuf);
- size_t i;
- for (i = 0; i < len; i++)
+ if ( textbuf )
{
- int c = (unsigned char) textbuf[i];
- if (c == ')' || c == '(' || c == '\\')
- {
- /* Cope with special characters */
- PsPrint( "\\" );
- PsPrint( (char) c );
- }
- else if ( c >= 128 )
- {
- /* Cope with character codes > 127 */
- buffer.Printf( "\\%o", c);
- PsPrint( buffer );
- }
- else
+ for ( const char *p = textbuf; *p != '\0'; p++ )
{
- PsPrint( (char) c );
+ int c = (unsigned char)*p;
+ if (c == ')' || c == '(' || c == '\\')
+ {
+ /* Cope with special characters */
+ PsPrint( "\\" );
+ PsPrint( (char) c );
+ }
+ else if ( c >= 128 )
+ {
+ /* Cope with character codes > 127 */
+ buffer.Printf( "\\%o", c);
+ PsPrint( buffer );
+ }
+ else
+ {
+ PsPrint( (char) c );
+ }
}
}
m_backgroundBrush = brush;
}
-void wxPostScriptDCImpl::SetLogicalFunction (int WXUNUSED(function))
+void wxPostScriptDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))
{
wxFAIL_MSG( wxT("wxPostScriptDCImpl::SetLogicalFunction not implemented.") );
}
}
-bool wxPostScriptDCImpl::StartDoc( const wxString& message )
+bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )
{
wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
{
if (m_printData.GetFilename() == wxEmptyString)
{
- wxString filename = wxGetTempFileName( wxT("ps") );
+ wxString filename = wxFileName::CreateTempFileName( wxT("ps") );
m_printData.SetFilename(filename);
}
}
m_ok = true;
- m_title = message;
wxString buffer;
PsPrint( "%!PS-Adobe-2.0\n" );
- buffer.Printf( "%%%%Title: %s\n", m_title );
- PsPrint( buffer );
PsPrint( "%%Creator: wxWidgets PostScript renderer\n" );
buffer.Printf( "%%%%CreationDate: %s\n", wxNow() );
if ( m_pstream ) {
fclose( m_pstream );
- m_pstream = (FILE *) NULL;
+ m_pstream = NULL;
}
#if 0
wxCoord fwidth, wxCoord fheight,
wxDC *source,
wxCoord xsrc, wxCoord ysrc,
- int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
+ wxRasterOperationMode rop,
+ bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
{
wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
wxCoord wxPostScriptDCImpl::GetCharHeight() const
{
- if (m_font.Ok())
+ if (m_font.IsOk())
return m_font.GetPointSize();
else
return 12;
if (!fontToUse) fontToUse = &m_font;
- wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
+ const float fontSize =
+ fontToUse->GetPointSize() * GetFontPointSizeAdjustment(72.0);
if (string.empty())
{
* Produces accurate results for mono-spaced font
* such as Courier (aka wxMODERN) */
- int height = 12;
- if (fontToUse)
- {
- height = fontToUse->GetPointSize();
- }
if ( x )
- *x = strlen (strbuf) * height * 72 / 120;
+ *x = strlen (strbuf) * fontSize * 72.0 / 120.0;
if ( y )
- *y = (wxCoord) (height * 1.32); /* allow for descender */
+ *y = (wxCoord) (fontSize * 1.32); /* allow for descender */
if (descent) *descent = 0;
if (externalLeading) *externalLeading = 0;
#else
/ example:
/
/ wxPostScriptDC dc(NULL, true);
- / if (dc.Ok()){
+ / if (dc.IsOk()){
/ wxSetAFMPath("d:\\wxw161\\afm\\");
/ dc.StartDoc("Test");
/ dc.StartPage();
// VS: dirty, but is there any better solution?
double *pt;
pt = (double*) &m_underlinePosition;
- *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f;
+ *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontSize)) / 1000.0f;
pt = (double*) &m_underlineThickness;
- *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontToUse->GetPointSize())) / 1000.0f;
+ *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontSize)) / 1000.0f;
}
/ string. they are given in 1/1000 of the size! */
long sum=0;
- wxCoord height=Size; /* by default */
+ float height=fontSize; /* by default */
unsigned char *p;
for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++)
{
}
double widthSum = sum;
- widthSum *= Size;
+ widthSum *= fontSize;
widthSum /= 1000.0F;
/* add descender to height (it is usually a negative value) */
if ( x )
*x = (wxCoord)widthSum;
if ( y )
- *y = height;
+ *y = (wxCoord)height;
/* return other parameters */
if (descent)
{
if(lastDescender!=INT_MIN)
{
- *descent = (wxCoord)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */
+ *descent = (wxCoord)(((-lastDescender)/1000.0F) * fontSize); /* MATTHEW: forgot scale */
}
else
{
projects / wxWidgets.git / blobdiff