#include "wx/log.h"
#include "wx/generic/dcpsg.h"
#include "wx/prntbase.h"
+#include "wx/generic/prntdlgg.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>
+#include "wx/math.h"
#ifdef __WXMSW__
} ifelse % end of 'false' case\n\
";
-#if wxUSE_PANGO
-#else
static char wxPostScriptHeaderReencodeISO1[] =
"\n/reencodeISO {\n"
"dup dup findfont dup length dict begin\n"
"/otilde/odieresis/divide/oslash/ugrave/uacute/ucircumflex/udieresis\n"
"/yacute/thorn/ydieresis\n"
"] def\n\n";
-#endif
//-------------------------------------------------------------------------------
// wxPostScriptDC
m_pageNumber = 0;
- m_clipping = FALSE;
+ m_clipping = false;
m_underlinePosition = 0.0;
m_underlineThickness = 0.0;
m_pageNumber = 0;
- m_clipping = FALSE;
+ m_clipping = false;
m_underlinePosition = 0.0;
m_underlineThickness = 0.0;
m_printData = printData;
- m_ok = TRUE;
+ m_ok = true;
}
wxPostScriptDC::~wxPostScriptDC ()
}
}
-#if WXWIN_COMPATIBILITY_2_2
-bool wxPostScriptDC::Create( const wxString &output, bool interactive, wxWindow *parent )
-{
- wxPrintData data;
- data.SetFilename( output );
- data.SetPrintMode( wxPRINT_MODE_FILE );
-
- if (interactive)
- {
- wxPrintDialogData ddata( data );
- wxPrintDialog dialog( parent, &data );
- dialog.GetPrintDialogData().SetSetupDialog(TRUE);
- if (dialog.ShowModal() != wxID_OK)
- {
- m_ok = FALSE;
- return FALSE;
- }
- data = dialog.GetPrintDialogData().GetPrintData();
- }
-
- return TRUE;
-}
-#endif
-
-
bool wxPostScriptDC::Ok() const
{
return m_ok;
wxDC::DoSetClippingRegion(x, y, w, h);
- m_clipping = TRUE;
+ m_clipping = true;
PsPrintf( wxT("gsave\n newpath\n")
wxT("%d %d moveto\n")
if (m_clipping)
{
- m_clipping = FALSE;
+ m_clipping = false;
PsPrint( "grestore\n" );
}
bool wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style))
{
wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") );
- return FALSE;
+ return false;
}
bool wxPostScriptDC::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const
{
wxFAIL_MSG( wxT("wxPostScriptDC::GetPixel not implemented.") );
- return FALSE;
+ return false;
}
void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
wxT("%d %d moveto\n"),
LogicalToDeviceX(points[0].x+xoffset),
LogicalToDeviceY(points[0].y+yoffset) );
-
+
for (i = 1; i < n; i++)
{
PsPrintf( wxT("%d %d lineto\n"),
LogicalToDeviceX(points[i].x+xoffset),
LogicalToDeviceY(points[i].y+yoffset) );
}
-
+
PsPrint( "stroke\n" );
}
/* Draw rectangle anticlockwise */
PsPrintf( wxT("newpath\n")
wxT("%d %d %d 90 180 arc\n")
- wxT("%d %d moveto\n")
+ wxT("%d %d lineto\n")
wxT("%d %d %d 180 270 arc\n")
wxT("%d %d lineto\n")
wxT("%d %d %d 270 0 arc\n")
wxT("closepath\n")
wxT("fill\n"),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
- LogicalToDeviceX(x), LogicalToDeviceY(y + rad),
+ LogicalToDeviceX(x), LogicalToDeviceY(y + height - rad),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height),
LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
/* Draw rectangle anticlockwise */
PsPrintf( wxT("newpath\n")
wxT("%d %d %d 90 180 arc\n")
- wxT("%d %d moveto\n")
+ wxT("%d %d lineto\n")
wxT("%d %d %d 180 270 arc\n")
wxT("%d %d lineto\n")
wxT("%d %d %d 270 0 arc\n")
wxT("closepath\n")
wxT("stroke\n"),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
- LogicalToDeviceX(x), LogicalToDeviceY(y + rad),
+ LogicalToDeviceX(x), LogicalToDeviceY(y + height - rad),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height),
LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
void wxPostScriptDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
{
- DrawBitmap( icon, x, y, TRUE );
+ DrawBitmap( icon, x, y, true );
}
/* this has to be char, not wxChar */
m_font = font;
-#if wxUSE_PANGO
-#else
int Style = m_font.GetStyle();
int Weight = m_font.GetWeight();
// We may legitimately call SetFont before BeginDoc
if (!m_pstream)
return;
-
+
PsPrint( name );
PsPrint( " reencodeISO def\n" );
PsPrint( name );
PsPrint( " 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
for (int i = 0; i < 100; i++)
if (buffer[i] == ',') buffer[i] = '.';
PsPrint( buffer );
-#endif // !wxUSE_PANGO
}
void wxPostScriptDC::SetPen( const wxPen& pen )
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",
if (buffer[i] == ',') buffer[i] = '.';
PsPrint( buffer );
-
+
m_currentRed = red;
m_currentBlue = blue;
m_currentGreen = green;
redPS, greenPS, bluePS );
for (int i = 0; i < 100; i++)
if (buffer[i] == ',') buffer[i] = '.';
-
+
PsPrint( buffer );
m_currentRed = red;
}
}
-#if wxUSE_PANGO
-
-#define PANGO_ENABLE_ENGINE
-
-#ifdef __WXGTK20__
-#include "wx/gtk/private.h"
-#include "gtk/gtk.h"
-#else
-#include "wx/x11/private.h"
-#endif
-
-#include "wx/fontutil.h"
-#include <pango/pangoft2.h>
-#include <freetype/ftglyph.h>
-
-#ifndef FT_Outline_Decompose
- FT_EXPORT( FT_Error ) FT_Outline_Decompose(
- FT_Outline* outline,
- const FT_Outline_Funcs* interface,
- void* user );
-#endif
-
-typedef struct _OutlineInfo OutlineInfo;
-struct _OutlineInfo {
- wxPostScriptDC* caller;
-};
-
-static int paps_move_to( FT_Vector* to, void *user_data)
-{
- OutlineInfo *outline_info = (OutlineInfo*)user_data;
- outline_info->caller->PsPrintf( wxT("%d %d moveto\n"), (int)to->x, (int)to->y );
- return 0;
-}
-
-static int paps_line_to( FT_Vector* to, void *user_data)
-{
- OutlineInfo *outline_info = (OutlineInfo*)user_data;
- outline_info->caller->PsPrintf( wxT("%d %d lineto\n"), (int)to->x , (int)to->y );
- return 0;
-}
-
-static int paps_conic_to( FT_Vector* control, FT_Vector* to, void *user_data)
-{
- OutlineInfo *outline_info = (OutlineInfo*)user_data;
- outline_info->caller->PsPrintf( wxT("%d %d %d %d conicto\n"),
- (int)control->x ,
- (int)control->y ,
- (int)to->x ,
- (int)to->y );
- return 0;
-}
-
-static int
-paps_cubic_to( FT_Vector* control1, FT_Vector* control2,
- FT_Vector* to, void *user_data)
-{
- OutlineInfo *outline_info = (OutlineInfo*)user_data;
- outline_info->caller->PsPrintf(wxT("%d %d %d %d %d %d curveto\n"),
- (int)control1->x ,
- (int)control1->y ,
- (int)control2->x ,
- (int)control2->y ,
- (int)to->x ,
- (int)to->y );
- return 0;
-}
-
-void draw_bezier_outline(wxPostScriptDC* caller,
- FT_Face face,
- FT_UInt glyph_index,
- int pos_x,
- int pos_y,
- double scale_x,
- double scale_y )
-{
- FT_Int load_flags = FT_LOAD_NO_BITMAP;
- FT_Glyph glyph;
-
- FT_Outline_Funcs outlinefunc =
- {
- paps_move_to,
- paps_line_to,
- paps_conic_to,
- paps_cubic_to
- };
-
- OutlineInfo outline_info;
- outline_info.caller = caller;
-
- caller->PsPrint("gsave\n");
- caller->PsPrintf( wxT("%d %d translate\n"), pos_x, pos_y );
-
- // 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] = '.';
- caller->PsPrint(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);
- caller->PsPrint("closepath fill grestore\n");
-
- FT_Done_Glyph (glyph);
-}
-
-#endif
-
void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y )
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
}
}
-#if wxUSE_PANGO
- 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 );
-
- pango_context_set_font_description (context, m_font.GetNativeFontInfo()->description );
-
- PangoLayout *layout = pango_layout_new (context);
-#if wxUSE_UNICODE
- wxCharBuffer buffer = wxConvUTF8.cWC2MB( text );
-#else
- wxCharBuffer buffer = wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC( text ) );
-#endif
- pango_layout_set_text( layout, (const char*) buffer, strlen(buffer) );
-
- PsPrintf( wxT("%%%% %s\n"), text.c_str() );
-
- PangoRectangle rect;
- pango_layout_get_extents(layout, NULL, &rect);
-
- 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)
- {
- PangoLayoutRun *run = (PangoLayoutRun*) runs_list->data;
- PangoItem *item = run->item;
- PangoGlyphString *glyphs = run->glyphs;
- 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 = xxx + (int)((double)(all_width+geometry.x_offset) / scale);
- int pos_y = yyy + (int)((double)geometry.y_offset / scale );
- all_width += geometry.width;
-
- draw_bezier_outline( this, 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 // !wxUSE_PANGO
wxCoord text_w, text_h, text_descent;
GetTextExtent(text, &text_w, &text_h, &text_descent);
PsPrintf( wxT("%d %d moveto\n"), LogicalToDeviceX(x), LogicalToDeviceY(by) );
PsPrint( "(" );
-
+
const wxWX2MBbuf textbuf = text.mb_str();
size_t len = strlen(textbuf);
size_t i;
PsPrint(c);
}
}
-
+
PsPrint( ") show\n" );
-
+
if (m_font.GetUnderlined())
{
wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
CalcBoundingBox( x, y );
CalcBoundingBox( x + size * text.Length() * 2/3 , y );
-#endif // wxUSE_PANGO/!wxUSE_PANGO
}
void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle )
PsPrintf( wxT("%d %d moveto\n"),
LogicalToDeviceX(x), LogicalToDeviceY(y));
-
+
char buffer[100];
sprintf(buffer, "%.8f rotate\n", angle);
size_t i;
if (buffer[i] == ',') buffer[i] = '.';
}
PsPrint( buffer);
-
+
PsPrint( "(" );
const wxWX2MBbuf textbuf = text.mb_str();
size_t len = strlen(textbuf);
PsPrint(c);
}
}
-
+
PsPrint( ") show\n" );
-
+
sprintf( buffer, "%.8f rotate\n", -angle );
for (i = 0; i < 100; i++)
{
if (buffer[i] == ',') buffer[i] = '.';
}
PsPrint( buffer );
-
+
if (m_font.GetUnderlined())
{
wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
}
PsPrint( buffer );
}
-
+
CalcBoundingBox( x, y );
CalcBoundingBox( x + size * text.Length() * 2/3 , y );
}
m_signX = (xLeftRight ? 1 : -1);
m_signY = (yBottomUp ? 1 : -1);
- // FIXME there is no such function in MSW nor in OS2/PM
-#if !defined(__WXMSW__) && !defined(__WXPM__)
ComputeScaleAndOrigin();
-#endif
}
void wxPostScriptDC::SetDeviceOrigin( wxCoord x, wxCoord y )
bool wxPostScriptDC::StartDoc( const wxString& message )
{
- wxCHECK_MSG( m_ok, FALSE, wxT("invalid postscript dc") );
+ wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
- if ( m_printData.GetPrintMode() != wxPRINT_MODE_STREAM )
+ if (m_printData.GetPrintMode() != wxPRINT_MODE_STREAM )
{
- if (m_printData.GetFilename() == wxT(""))
+ if (m_printData.GetFilename() == wxEmptyString)
{
wxString filename = wxGetTempFileName( wxT("ps") );
m_printData.SetFilename(filename);
}
- // FIXME: use fn_str() here under Unicode?
- m_pstream = wxFopen( m_printData.GetFilename().c_str(), wxT("w+") );
+ m_pstream = wxFopen( m_printData.GetFilename(), wxT("w+") );
if (!m_pstream)
{
wxLogError( _("Cannot open file for PostScript printing!"));
- m_ok = FALSE;
- return FALSE;
+ m_ok = false;
+ return false;
}
}
- m_ok = TRUE;
+ m_ok = true;
m_title = message;
PsPrint( "%!PS-Adobe-2.0\n" );
PsPrintf( wxT("%%%%Title: %s\n"), m_title.c_str() );
- PsPrint( "%%Creator: wxWindows PostScript renderer\n" );
+ PsPrint( "%%Creator: wxWidgets PostScript renderer\n" );
PsPrintf( wxT("%%%%CreationDate: %s\n"), wxNow().c_str() );
if (m_printData.GetOrientation() == wxLANDSCAPE)
PsPrint( "%%Orientation: Landscape\n" );
PsPrint( wxPostScriptHeaderEllipse );
PsPrint( wxPostScriptHeaderEllipticArc );
PsPrint( wxPostScriptHeaderColourImage );
-#if wxUSE_PANGO
-#else
PsPrint( wxPostScriptHeaderReencodeISO1 );
PsPrint( wxPostScriptHeaderReencodeISO2 );
-#endif
if (wxPostScriptHeaderSpline)
PsPrint( wxPostScriptHeaderSpline );
PsPrint( "%%EndProlog\n" );
wxPageNumber = 1;
m_pageNumber = 1;
- return TRUE;
+ return true;
}
void wxPostScriptDC::EndDoc ()
if (m_clipping)
{
- m_clipping = FALSE;
+ m_clipping = false;
PsPrint( "grestore\n" );
}
PsPrintf( wxT("%% %d %d lineto closepath stroke\n"), llx, ury );
#endif
-#if defined(__X__) || defined(__WXGTK__)
+#ifndef __WXMSW__
+ wxPostScriptPrintNativeData *data =
+ (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))
{
wxString command;
- command += m_printData.GetPrinterCommand();
+ command += data->GetPrinterCommand();
command += wxT(" ");
- command += m_printData.GetPrinterOptions();
+ command += data->GetPrinterOptions();
command += wxT(" ");
command += m_printData.GetFilename();
- wxExecute( command, TRUE );
+ wxExecute( command, true );
wxRemoveFile( m_printData.GetFilename() );
}
#endif
wxCoord translate_x, translate_y;
double scale_x, scale_y;
- translate_x = (wxCoord)m_printData.GetPrinterTranslateX();
- translate_y = (wxCoord)m_printData.GetPrinterTranslateY();
+ wxPostScriptPrintNativeData *data =
+ (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+ translate_x = (wxCoord)data->GetPrinterTranslateX();
+ translate_y = (wxCoord)data->GetPrinterTranslateY();
- scale_x = m_printData.GetPrinterScaleX();
- scale_y = m_printData.GetPrinterScaleY();
+ scale_x = data->GetPrinterScaleX();
+ scale_y = data->GetPrinterScaleY();
if (m_printData.GetOrientation() == wxLANDSCAPE)
{
wxCoord xsrc, wxCoord ysrc,
int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) )
{
- wxCHECK_MSG( m_ok, FALSE, wxT("invalid postscript dc") );
+ wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
- wxCHECK_MSG( source, FALSE, wxT("invalid source dc") );
+ wxCHECK_MSG( source, false, wxT("invalid source dc") );
/* blit into a bitmap */
wxBitmap bitmap( (int)fwidth, (int)fheight );
/* draw bitmap. scaling and positioning is done there */
DrawBitmap( bitmap, xdest, ydest );
- return TRUE;
+ return true;
}
wxCoord wxPostScriptDC::GetCharHeight() const
wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
- if (string.IsEmpty())
+ if (string.empty())
{
if (x) (*x) = 0;
if (y) (*y) = 0;
return;
}
-#if wxUSE_PANGO
- 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 );
-#else
- 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) ( 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
const wxWX2MBbuf strbuf = string.mb_str();
/
/ example:
/
- / wxPostScriptDC dc(NULL, TRUE);
+ / wxPostScriptDC dc(NULL, true);
/ if (dc.Ok()){
/ wxSetAFMPath("d:\\wxw161\\afm\\");
/ dc.StartDoc("Test");
FILE *afmFile = NULL;
+ wxPostScriptPrintNativeData *data =
+ (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
// Get the directory of the AFM files
wxString afmName;
- if (!m_printData.GetFontMetricPath().IsEmpty())
+ if (!data->GetFontMetricPath().empty())
{
- afmName = m_printData.GetFontMetricPath();
+ afmName = data->GetFontMetricPath();
afmName << wxFILE_SEP_PATH << name;
afmFile = wxFopen(afmName,wxT("r"));
}
/* init the widths array */
for(int i=0; i<256; i++) lastWidths[i] = INT_MIN;
/* some variables for holding parts of a line */
- char cString[10],semiString[10],WXString[10],descString[20];
- char upString[30], utString[30], encString[50];
+ char cString[10], semiString[10], WXString[10];
+ char descString[20];
+ char upString[30], utString[30];
+ char encString[50];
char line[256];
int ascii,cWidth;
/* read in the file and parse it */
if (externalLeading) *externalLeading = 0;
#endif
// Use AFM
-
-#endif
- // GTK 2.0
}
// print postscript datas via required method (file, stream)
void wxPostScriptDC::PsPrint( const char* psdata )
{
- switch( m_printData.GetPrintMode() )
+ wxPostScriptPrintNativeData *data =
+ (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+ switch (m_printData.GetPrintMode())
{
#if wxUSE_STREAMS
// append to output stream
case wxPRINT_MODE_STREAM:
{
- wxOutputStream* outputstream = m_printData.GetOutputStream();
+ wxOutputStream* outputstream = data->GetOutputStream();
wxCHECK_RET( outputstream, wxT("invalid outputstream") );
outputstream->Write( psdata, strlen( psdata ) );
}
void wxPostScriptDC::PsPrint( int ch )
{
- switch( m_printData.GetPrintMode() )
+ wxPostScriptPrintNativeData *data =
+ (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
+
+ switch (m_printData.GetPrintMode())
{
#if wxUSE_STREAMS
// append to output stream
case wxPRINT_MODE_STREAM:
{
- wxOutputStream* outputstream = m_printData.GetOutputStream();
+ wxOutputStream* outputstream = data->GetOutputStream();
wxCHECK_RET( outputstream, wxT("invalid outputstream") );
- outputstream->PutC( ch );
+ outputstream->PutC( (char)ch );
}
break;
#endif // wxUSE_STREAMS
}
}
-#if WXWIN_COMPATIBILITY_2_2
-WXDLLEXPORT wxPrintSetupData *wxThePrintSetupData = 0;
-
-void wxInitializePrintSetupData(bool init)
-{
- if (init)
- {
- // gets initialized in the constructor
- wxThePrintSetupData = new wxPrintSetupData;
- }
- else
- {
- delete wxThePrintSetupData;
-
- wxThePrintSetupData = (wxPrintSetupData *) NULL;
- }
-}
-
-// A module to allow initialization/cleanup of PostScript-related
-// things without calling these functions from app.cpp.
-
-class WXDLLEXPORT wxPostScriptModule: public wxModule
-{
-DECLARE_DYNAMIC_CLASS(wxPostScriptModule)
-public:
- wxPostScriptModule() {}
- bool OnInit();
- void OnExit();
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptModule, wxModule)
-
-bool wxPostScriptModule::OnInit()
-{
- wxInitializePrintSetupData();
-
- return TRUE;
-}
-
-void wxPostScriptModule::OnExit()
-{
- wxInitializePrintSetupData(FALSE);
-}
-#endif
- // WXWIN_COMPATIBILITY_2_2
-
#endif
// wxUSE_POSTSCRIPT
projects / wxWidgets.git / blobdiff