//-------------------------------------------------------------------------------
-#if wxUSE_NEW_DC
-
IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
wxPostScriptDC::wxPostScriptDC()
+ : wxDC(new wxPostScriptDCImpl(this))
{
- m_pimpl = new wxPostScriptDCImpl( this );
}
wxPostScriptDC::wxPostScriptDC(const wxPrintData& printData)
+ : wxDC(new wxPostScriptDCImpl(this, printData))
{
- m_pimpl = new wxPostScriptDCImpl( this, printData );
}
-#endif
-
-
// conversion
static const double RAD2DEG = 180.0 / M_PI;
#define YLOG2DEVREL(x) ((double)(LogicalToDeviceYRel(x)) * DEV2PS)
-#if wxUSE_NEW_DC
IMPLEMENT_ABSTRACT_CLASS(wxPostScriptDCImpl, wxDCImpl)
-#else
-IMPLEMENT_ABSTRACT_CLASS(wxPostScriptDC, wxDC)
-#endif
//-------------------------------------------------------------------------------
-#if wxUSE_NEW_DC
wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner ) :
wxDCImpl( owner )
{
Init();
m_pageHeight = 842 * PS2DEV;
-
+
m_ok = true;
}
wxDCImpl( owner )
{
Init();
-
+
// this calculates m_pageHeight required for
// taking the inverted Y axis into account
SetPrintData( data );
m_ok = true;
}
-#endif
-#if wxUSE_NEW_DC
wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner ) :
wxDCImpl( owner )
-#else
-wxPostScriptDC::wxPostScriptDC()
-#endif
{
Init();
m_pageHeight = 842 * PS2DEV;
-
+
m_ok = true;
}
-#if wxUSE_NEW_DC
wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ) :
wxDCImpl( owner )
-#else
-wxPostScriptDC::wxPostScriptDC( const wxPrintData& data )
-#endif
{
Init();
-
+
// this calculates m_pageHeight required for
// taking the inverted Y axis into account
SetPrintData( data );
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;
}
if (m_clipping)
DestroyClippingRegion();
-#if wxUSE_NEW_DC
m_clipX1 = x;
m_clipY1 = y;
m_clipX2 = x + w;
m_clipY2 = y + h;
-#else
- wxDC::DoSetClippingRegion(x, y, w, h);
-#endif
m_clipping = true;
PsPrint( "grestore\n" );
}
-#if wxUSE_NEW_DC
wxDCImpl::DestroyClippingRegion();
-#else
- wxDC::DestroyClippingRegion();
-#endif
}
void wxPostScriptDCImpl::Clear()
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (m_pen.GetStyle() == wxTRANSPARENT) return;
+ if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;
SetPen( m_pen );
int i_radius = wxRound( radius );
- if (m_brush.GetStyle() != wxTRANSPARENT)
+ if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
{
SetBrush( m_brush );
CalcBoundingBox( xc+i_radius, yc+i_radius );
}
- if (m_pen.GetStyle() != wxTRANSPARENT)
+ if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
{
SetPen( m_pen );
return;
}
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
{
SetBrush( m_brush );
CalcBoundingBox( x+w, y+h );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
{
SetPen( m_pen );
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (m_pen.GetStyle() == wxTRANSPARENT) return;
+ if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;
SetPen (m_pen);
if (n <= 0) return;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
{
SetBrush( m_brush );
PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
{
SetPen( m_pen );
if (n <= 0) return;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
{
SetBrush( m_brush );
PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
{
SetPen( m_pen );
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (m_pen.GetStyle() == wxTRANSPARENT) return;
+ if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;
if (n <= 0) return;
width--;
height--;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
{
SetBrush( m_brush );
CalcBoundingBox( x + width, y + height );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
{
SetPen (m_pen);
wxCoord rad = (wxCoord) radius;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
{
SetBrush( m_brush );
CalcBoundingBox( x + width, y + height );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
{
SetPen (m_pen);
width--;
height--;
- if (m_brush.GetStyle () != wxTRANSPARENT)
+ if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
{
SetBrush (m_brush);
CalcBoundingBox( x + width, y + height );
}
- if (m_pen.GetStyle () != wxTRANSPARENT)
+ if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
{
SetPen (m_pen);
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 );
}
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 );
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 */
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 == '\\')
+ for ( const char *p = textbuf; *p != '\0'; p++ )
{
- /* 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 );
+ 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_pageHeight = h * PS2DEV;
}
-#if wxUSE_NEW_DC
-#else
-void wxPostScriptDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
-{
- wxDCBase::SetAxisOrientation(xLeftRight,yBottomUp);
-}
-
-void wxPostScriptDCImpl::SetMapMode(int mode)
-{
- wxDCBase::SetMapMode(mode);
-}
-
-void wxPostScriptDCImpl::SetUserScale(double x, double y)
-{
- wxDCBase::SetUserScale(x,y);
-}
-
-void wxPostScriptDCImpl::SetLogicalScale(double x, double y)
-{
- wxDCBase::SetLogicalScale(x,y);
-}
-
-void wxPostScriptDCImpl::SetLogicalOrigin(wxCoord x, wxCoord y)
-{
- wxDCBase::SetLogicalOrigin(x,y);
-}
-
-void wxPostScriptDCImpl::SetDeviceOrigin(wxCoord x, wxCoord y)
-{
- wxDCBase::SetDeviceOrigin(x,y);
-}
-#endif
-
void wxPostScriptDCImpl::ComputeScaleAndOrigin()
{
const wxRealPoint origScale(m_scaleX, m_scaleY);
-#if wxUSE_NEW_DC
wxDCImpl::ComputeScaleAndOrigin();
-#else
- wxDC::ComputeScaleAndOrigin();
-#endif
// If scale has changed call SetPen to recalulate the line width
// and SetFont to recalculate font size
}
-bool wxPostScriptDCImpl::StartDoc( const wxString& message )
+bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) )
{
wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
}
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 (!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
/ these values from AFM files, too. Maybe later ... */
// 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]; // ß
+ lastWidths[196] = lastWidths[(int)'A']; // U+00C4 A Umlaute
+ lastWidths[228] = lastWidths[(int)'a']; // U+00E4 a Umlaute
+ lastWidths[214] = lastWidths[(int)'O']; // U+00D6 O Umlaute
+ lastWidths[246] = lastWidths[(int)'o']; // U+00F6 o Umlaute
+ lastWidths[220] = lastWidths[(int)'U']; // U+00DC U Umlaute
+ lastWidths[252] = lastWidths[(int)'u']; // U+00FC u Umlaute
+ lastWidths[223] = lastWidths[(int)251]; // U+00DF eszett (scharfes s)
/* JC: calculate UnderlineThickness/UnderlinePosition */
// 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