X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92980e9076469956e1e2cb94df97d0f8d873114a..1a44c9258a2506e006caa02ddcae85ac832050af:/src/generic/dcpsg.cpp?ds=sidebyside diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 47421d57b1..fc713f7ca2 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -28,24 +28,20 @@ #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 @@ -88,8 +84,6 @@ static const char *wxPostScriptHeaderConicTo = "\ /p2_y p1_y to_y p0_y sub 1 3 div mul add def\n\ p1_x p1_y p2_x p2_y to_x to_y curveto\n\ } bind def\n\ -/start_ol { gsave 1.0 72 div dup scale } bind def\n\ -/end_ol { closepath fill grestore } bind def\n\ "; static const char *wxPostScriptHeaderEllipse = "\ @@ -206,7 +200,8 @@ static const char *wxPostScriptHeaderColourImage = "\ } ifelse %% end of 'false' case\n\ "; -#ifndef __WXGTK20__ +#if wxUSE_PANGO +#else static char wxPostScriptHeaderReencodeISO1[] = "\n/reencodeISO {\n" "dup dup findfont dup length dict begin\n" @@ -253,7 +248,9 @@ static char wxPostScriptHeaderReencodeISO2[] = // wxPostScriptDC //------------------------------------------------------------------------------- -float wxPostScriptDC::ms_PSScaleFactor = 10.0; +IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) + +float wxPostScriptDC::ms_PSScaleFactor = 1.0; void wxPostScriptDC::SetResolution(int ppi) { @@ -265,7 +262,7 @@ int wxPostScriptDC::GetResolution() return (int)(ms_PSScaleFactor * 72.0); } - +//------------------------------------------------------------------------------- wxPostScriptDC::wxPostScriptDC () { @@ -284,57 +281,6 @@ wxPostScriptDC::wxPostScriptDC () m_signX = 1; // default x-axis left to right m_signY = -1; // default y-axis bottom up -> top down - - // Compatibility only - // HH: Doesn't seem to work for wxMSW... - #if !defined(__WXMSW__) - m_printData = * wxThePrintSetupData; - #endif -} - -wxPostScriptDC::wxPostScriptDC (const wxString& file, bool interactive, wxWindow *parent) -{ - m_pstream = (FILE*) NULL; - - m_currentRed = 0; - m_currentGreen = 0; - m_currentBlue = 0; - - m_pageNumber = 0; - - m_clipping = FALSE; - - m_underlinePosition = 0.0; - m_underlineThickness = 0.0; - - m_signX = 1; // default x-axis left to right - m_signY = -1; // default y-axis bottom up -> top down - - Create(file, interactive, parent); -} - -bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *parent) -{ - m_isInteractive = interactive; - - m_title = ""; - m_printData.SetFilename(file); - -#ifdef __WXMSW__ - // Can only send to file in Windows - m_printData.SetPrintMode(wxPRINT_MODE_FILE); -#endif - - if (m_isInteractive) - { - if ((m_ok = PrinterDialog (parent) ) == FALSE) return FALSE; - } - else - { - m_ok = TRUE; - } - - return m_ok; } wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) @@ -369,57 +315,34 @@ wxPostScriptDC::~wxPostScriptDC () } } -bool wxPostScriptDC::Ok() const -{ - return m_ok; -} - -// This dialog is deprecated now: use wxGenericPrintDialog or the printing framework -bool wxPostScriptDC::PrinterDialog(wxWindow *parent) +#if WXWIN_COMPATIBILITY_2_2 +bool wxPostScriptDC::Create( const wxString &output, bool interactive, wxWindow *parent ) { - wxPostScriptPrintDialog dialog( parent, _("Printer Settings"), wxPoint(150, 150), wxSize(400, 400), - wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL ); - m_ok = (dialog.ShowModal () == wxID_OK); - - if (!m_ok) return FALSE; - - if ((m_printData.GetFilename() == "") && - (m_printData.GetPrintMode() == wxPRINT_MODE_PREVIEW || - m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER)) + wxPrintData data; + data.SetFilename( output ); + data.SetPrintMode( wxPRINT_MODE_FILE ); + + if (interactive) { -// steve, 05.09.94 -#ifdef __VMS__ - m_printData.SetFilename("preview"); -#else - // For PS_PRINTER action this depends on a Unix-style print spooler - // since the wx_printer_file can be destroyed during a session - // @@@ TODO: a Windows-style answer for non-Unix - wxChar userId[256]; - wxGetUserId (userId, sizeof (userId) / sizeof (char)); - wxChar tmp[256]; - wxStrcpy (tmp, wxT("/tmp/preview_")); - wxStrcat (tmp, userId); - m_printData.SetFilename(tmp); -#endif - wxChar tmp2[256]; - wxStrcpy(tmp2, m_printData.GetFilename()); - wxStrcat (tmp2, wxT(".ps")); - m_printData.SetFilename(tmp2); + 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(); } - else if ((m_printData.GetFilename() == wxT("")) && (m_printData.GetPrintMode() == wxPRINT_MODE_FILE)) - { - wxString file = wxSaveFileSelector (_("PostScript"), wxT("ps")); - if ( file.IsEmpty() ) - { - m_ok = FALSE; - return FALSE; - } + + return TRUE; +} +#endif - m_printData.SetFilename(file); - m_ok = TRUE; - } - return m_ok; +bool wxPostScriptDC::Ok() const +{ + return m_ok; } void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h) @@ -960,7 +883,8 @@ void wxPostScriptDC::SetFont( const wxFont& font ) m_font = font; -#ifndef __WXGTK20__ +#if wxUSE_PANGO +#else int Style = m_font.GetStyle(); int Weight = m_font.GetWeight(); @@ -1045,6 +969,7 @@ void wxPostScriptDC::SetFont( const wxFont& font ) for (int i = 0; i < 100; i++) if (buffer[i] == ',') buffer[i] = '.'; fprintf( m_pstream, buffer ); + #endif } @@ -1191,11 +1116,18 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush ) } } -#ifdef __WXGTK20__ +#if wxUSE_PANGO + +#define PANGO_ENABLE_ENGINE +#ifdef __WXGTK20__ #include "wx/gtk/private.h" -#include "wx/fontutil.h" #include "gtk/gtk.h" +#else +#include "wx/x11/private.h" +#endif + +#include "wx/fontutil.h" #include #include @@ -1208,16 +1140,14 @@ void wxPostScriptDC::SetBrush( const wxBrush& brush ) typedef struct _OutlineInfo OutlineInfo; struct _OutlineInfo { - FILE *OUT; - FT_Vector glyph_origin; - int dpi; + FILE *file; }; static int paps_move_to( FT_Vector* to, void *user_data) { OutlineInfo *outline_info = (OutlineInfo*)user_data; - fprintf(outline_info->OUT, "%d %d moveto\n", + fprintf(outline_info->file, "%d %d moveto\n", (int)to->x , (int)to->y ); return 0; @@ -1227,7 +1157,7 @@ static int paps_line_to( FT_Vector* to, void *user_data) { OutlineInfo *outline_info = (OutlineInfo*)user_data; - fprintf(outline_info->OUT, "%d %d lineto\n", + fprintf(outline_info->file, "%d %d lineto\n", (int)to->x , (int)to->y ); return 0; @@ -1238,7 +1168,7 @@ static int paps_conic_to( FT_Vector* control, void *user_data) { OutlineInfo *outline_info = (OutlineInfo*)user_data; - fprintf(outline_info->OUT, "%d %d %d %d conicto\n", + fprintf(outline_info->file, "%d %d %d %d conicto\n", (int)control->x , (int)control->y , (int)to->x , @@ -1252,7 +1182,7 @@ static int paps_cubic_to( FT_Vector* control1, void *user_data) { OutlineInfo *outline_info = (OutlineInfo*)user_data; - fprintf(outline_info->OUT, + fprintf(outline_info->file, "%d %d %d %d %d %d curveto\n", (int)control1->x , (int)control1->y , @@ -1263,18 +1193,17 @@ static int paps_cubic_to( FT_Vector* control1, return 0; } -static void draw_bezier_outline(FILE *OUT, - int dpi, +void draw_bezier_outline(FILE *file, FT_Face face, FT_UInt glyph_index, - wxCoord pos_x, - wxCoord pos_y - ) + int pos_x, + int pos_y, + double scale_x, + double scale_y ) { - FT_Int load_flags = FT_LOAD_DEFAULT; + FT_Int load_flags = FT_LOAD_NO_BITMAP; FT_Glyph glyph; - /* Output outline */ FT_Outline_Funcs outlinefunc = { paps_move_to, @@ -1282,56 +1211,109 @@ static void draw_bezier_outline(FILE *OUT, paps_conic_to, paps_cubic_to }; + OutlineInfo outline_info; + outline_info.file = file; - outline_info.glyph_origin.x = (FT_Pos) pos_x; - outline_info.glyph_origin.y = (FT_Pos) pos_y; - outline_info.dpi = dpi; - outline_info.OUT = OUT; - - fprintf(OUT, "gsave %d %d translate 0 0 0 setrgbcolor\n", pos_x, pos_y); - fprintf(OUT, "start_ol\n"); + fprintf(file, "gsave\n"); + fprintf(file, "%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] = '.'; + 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(OUT, "end_ol grestore \n"); + fprintf(file, "closepath fill grestore\n"); FT_Done_Glyph (glyph); } - #endif void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) { wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") ); -#ifdef __WXGTK20__ - int dpi = GetResolution() * 2; + if (m_textForegroundColour.Ok()) + { + unsigned char red = m_textForegroundColour.Red(); + unsigned char blue = m_textForegroundColour.Blue(); + unsigned char green = m_textForegroundColour.Green(); - PangoContext *context = pango_ft2_get_context ( dpi, dpi ); + 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] = '.'; + fprintf( m_pstream, buffer ); + + m_currentRed = red; + m_currentBlue = blue; + m_currentGreen = green; + } + } + +#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; - // What are these for? pango_context_set_language (context, pango_language_from_string ("en_US")); pango_context_set_base_dir (context, PANGO_DIRECTION_LTR ); - // Set the font pango_context_set_font_description (context, m_font.GetNativeFontInfo()->description ); - // Create layout - PangoLayout *layout = layout = pango_layout_new (context); + 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) ); + + fprintf( m_pstream, "%%%% %s\n", (const char*)buffer ); + + 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. -#if 1 - double xx = LogicalToDeviceX(x); - double yy = LogicalToDeviceY(y /*+ bitmap.GetHeight()*/ ); +#define ps_kludge_factor 2.8 // Loop over lines in layout int num_lines = pango_layout_get_line_count( layout ); @@ -1339,6 +1321,9 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) { 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) @@ -1354,92 +1339,23 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) for (int glyph_idx = 0; glyph_idx < num_glyphs; glyph_idx++) { PangoGlyphGeometry geometry = glyphs->glyphs[glyph_idx].geometry; - double pos_x = xx + 1.0 * geometry.x_offset / PANGO_SCALE; - double pos_y = yy - 1.0 * geometry.y_offset / PANGO_SCALE; - xx += 1.0 * geometry.width / PANGO_SCALE; - - draw_bezier_outline( m_pstream, dpi, ft_face, + 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( m_pstream, ft_face, (FT_UInt)(glyphs->glyphs[glyph_idx].glyph), - (wxCoord)pos_x, (wxCoord)pos_y ); + 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; } } -#else - // Find out extent for the bitmap - int height = 0; - int width = 0; - PangoRectangle logical_rect; - pango_layout_get_extents (layout, NULL, &logical_rect); - height = PANGO_PIXELS (logical_rect.height); - width = PANGO_PIXELS (logical_rect.width); - - // printf( "h %d w %d lh %d lw %d\n", height, width, logical_rect.height, logical_rect.width ); - - // Allocate FreeType 2 bitmap - int byte_width = (width + 7)/8 * 8; - FT_Bitmap bitmap; - guchar *buf = (guchar*) g_malloc (byte_width * height); - memset (buf, 0x00, byte_width * height); - bitmap.rows = height; - bitmap.width = byte_width; - bitmap.pitch = byte_width; - bitmap.buffer = buf; - bitmap.num_grays = 256; - bitmap.pixel_mode = ft_pixel_mode_grays; - - // Render bitmap - pango_ft2_render_layout (&bitmap, layout, 0, 0); - - // Invert bitmap to get black text on white background - for (int pix_idx = 0; pix_idx < width * height; pix_idx++) - buf[pix_idx] = 255-buf[pix_idx]; - - // Write PS output - wxCoord xx = LogicalToDeviceX(x); - wxCoord yy = LogicalToDeviceY(y /*+ bitmap.GetHeight()*/ ); - - fprintf(m_pstream, "gsave\n"); - fprintf(m_pstream, "%d %d translate\n", xx, yy); - fprintf(m_pstream, "/img_width %d def\n", bitmap.width); - fprintf(m_pstream, "/img_height %d def\n", bitmap.rows); - fprintf(m_pstream, "/picstr img_width 8 idiv string def\n"); - - fprintf(m_pstream, - " img_width 72 15 div mul\n" - " img_height 72 15 div mul scale\n" - " 0 setgray\n" - " img_width img_height\n" - " true\n" - " [img_width 0 0 img_height neg 0 img_height 0.67 mul]\n" - " { currentfile\n" - " picstr readhexstring pop }\n" - " imagemask" - ); - - - for (int b_idx= 0; b_idx < bitmap.width/8 * bitmap.rows; b_idx++) - { - guchar packed_b = 0; - int bit_idx; - - if (b_idx % (bitmap.width/8) == 0) - fprintf(m_pstream, "\n"); - - for (bit_idx = 0; bit_idx < 8; bit_idx++) - { - guchar this_bit = bitmap.buffer[b_idx * 8+bit_idx]<128; - packed_b = (packed_b << 1) + this_bit; - } - fprintf(m_pstream, "%02x", packed_b); - } - - fprintf(m_pstream, "\ngrestore\n" ); - - // Free memory - g_free( buf ); -#endif + g_object_unref( G_OBJECT( layout ) ); + g_object_unref( G_OBJECT( context ) ); #else wxCoord text_w, text_h, text_descent; @@ -1449,45 +1365,6 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) // 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(); @@ -1602,11 +1479,8 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord 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) ); + LogicalToDeviceX(x), LogicalToDeviceY(y)); char buffer[100]; sprintf(buffer, "%.8f rotate\n", angle); @@ -1690,13 +1564,13 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) double a, b, c, d, x1, y1, x2, y2, x3, y3; wxPoint *p, *q; - wxNode *node = points->First(); - p = (wxPoint *)node->Data(); + wxNode *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; @@ -1712,9 +1586,9 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); - while ((node = node->Next()) != NULL) + while ((node = node->GetNext()) != NULL) { - q = (wxPoint *)node->Data(); + q = (wxPoint *)node->GetData(); x1 = x3; y1 = y3; @@ -1843,9 +1717,9 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) { wxCHECK_MSG( m_ok, FALSE, wxT("invalid postscript dc") ); - if (m_printData.GetFilename() == "") + if (m_printData.GetFilename() == wxT("")) { - wxString filename = wxGetTempFileName("ps"); + wxString filename = wxGetTempFileName( wxT("ps") ); m_printData.SetFilename(filename); } @@ -1860,12 +1734,46 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) m_ok = TRUE; + fprintf( m_pstream, "%%!PS-Adobe-2.0\n" ); + fprintf( m_pstream, "%%%%Title: %s\n", (const char *) m_title.ToAscii() ); + fprintf( m_pstream, "%%%%Creator: wxWindows PostScript renderer\n" ); + fprintf( m_pstream, "%%%%CreationDate: %s\n", (const char *) wxNow().ToAscii() ); + if (m_printData.GetOrientation() == wxLANDSCAPE) + fprintf( m_pstream, "%%%%Orientation: Landscape\n" ); + else + fprintf( m_pstream, "%%%%Orientation: Portrait\n" ); + + // fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) ); + + char *paper = "A4"; + switch (m_printData.GetPaperId()) + { + case wxPAPER_LETTER: paper = "Letter"; break; // Letter: paper ""; 8 1/2 by 11 inches + case wxPAPER_LEGAL: paper = "Legal"; break; // Legal, 8 1/2 by 14 inches + case wxPAPER_A4: paper = "A4"; break; // A4 Sheet, 210 by 297 millimeters + case wxPAPER_TABLOID: paper = "Tabloid"; break; // Tabloid, 11 by 17 inches + case wxPAPER_LEDGER: paper = "Ledger"; break; // Ledger, 17 by 11 inches + case wxPAPER_STATEMENT: paper = "Statement"; break; // Statement, 5 1/2 by 8 1/2 inches + case wxPAPER_EXECUTIVE: paper = "Executive"; break; // Executive, 7 1/4 by 10 1/2 inches + case wxPAPER_A3: paper = "A3"; break; // A3 sheet, 297 by 420 millimeters + case wxPAPER_A5: paper = "A5"; break; // A5 sheet, 148 by 210 millimeters + case wxPAPER_B4: paper = "B4"; break; // B4 sheet, 250 by 354 millimeters + case wxPAPER_B5: paper = "B5"; break; // B5 sheet, 182-by-257-millimeter paper + case wxPAPER_FOLIO: paper = "Folio"; break; // Folio, 8-1/2-by-13-inch paper + case wxPAPER_QUARTO: paper = "Quaro"; break; // Quarto, 215-by-275-millimeter paper + case wxPAPER_10X14: paper = "10x14"; break; // 10-by-14-inch sheet + default: paper = "A4"; + } + fprintf( m_pstream, "%%%%DocumentPaperSizes: %s\n", paper ); + fprintf( m_pstream, "%%%%EndComments\n\n" ); + fprintf( m_pstream, "%%%%BeginProlog\n" ); fprintf( m_pstream, wxPostScriptHeaderConicTo ); fprintf( m_pstream, wxPostScriptHeaderEllipse ); fprintf( m_pstream, wxPostScriptHeaderEllipticArc ); fprintf( m_pstream, wxPostScriptHeaderColourImage ); -#ifndef __WXGTK20__ +#if wxUSE_PANGO +#else fprintf( m_pstream, wxPostScriptHeaderReencodeISO1 ); fprintf( m_pstream, wxPostScriptHeaderReencodeISO2 ); #endif @@ -1900,18 +1808,8 @@ void wxPostScriptDC::EndDoc () fclose( m_pstream ); m_pstream = (FILE *) NULL; - wxChar *header_file = wxGetTempFileName("ps"); - - m_pstream = wxFopen( header_file, wxT("w+") ); - - fprintf( m_pstream, "%%!PS-Adobe-2.0\n" ); // PostScript magic strings - fprintf( m_pstream, "%%%%Title: %s\n", (const char *)m_title.mb_str() ); - fprintf( m_pstream, "%%%%Creator: wxWindows PostScript renderer\n" ); - fprintf( m_pstream, "%%%%CreationDate: %s\n", (const char *)wxNow().mb_str() ); - - +#if 0 // THE FOLLOWING HAS BEEN CONTRIBUTED BY Andy Fyfe - wxCoord wx_printer_translate_x, wx_printer_translate_y; double wx_printer_scale_x, wx_printer_scale_y; @@ -1921,11 +1819,6 @@ void wxPostScriptDC::EndDoc () wx_printer_scale_x = m_printData.GetPrinterScaleX(); wx_printer_scale_y = m_printData.GetPrinterScaleY(); - if (m_printData.GetOrientation() == wxLANDSCAPE) - fprintf( m_pstream, "%%%%Orientation: Landscape\n" ); - else - fprintf( m_pstream, "%%%%Orientation: Portrait\n" ); - // Compute the bounding box. Note that it is in the default user // coordinate system, thus we have to convert the values. wxCoord minX = (wxCoord) LogicalToDeviceX(m_minX); @@ -1968,8 +1861,6 @@ void wxPostScriptDC::EndDoc () "%%%%BoundingBox: %d %d %d %d\n", (wxCoord)floor((double)llx), (wxCoord)floor((double)lly), (wxCoord)ceil((double)urx), (wxCoord)ceil((double)ury) ); - fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) ); - fprintf( m_pstream, "%%%%EndComments\n\n" ); // To check the correctness of the bounding box, postscript commands // to draw a box corresponding to the bounding box are generated below. @@ -1982,66 +1873,18 @@ void wxPostScriptDC::EndDoc () fprintf( m_pstream, "%% %d %d lineto\n", urx, lly ); fprintf( m_pstream, "%% %d %d lineto\n", urx, ury ); fprintf( m_pstream, "%% %d %d lineto closepath stroke\n", llx, ury ); - - fclose( m_pstream ); - m_pstream = (FILE*) NULL; - - wxChar *tmp_file = wxGetTempFileName("ps"); - - // Paste header Before wx_printer_file - wxConcatFiles (header_file, m_printData.GetFilename(), tmp_file ); - wxRemoveFile( header_file ); - wxRemoveFile( m_printData.GetFilename() ); - wxRenameFile( tmp_file, m_printData.GetFilename() ); +#endif #if defined(__X__) || defined(__WXGTK__) - if (m_ok) + if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER)) { - wxString previewCommand(m_printData.GetPreviewCommand()); - wxString printerCommand(m_printData.GetPrinterCommand()); - wxString printerOptions(m_printData.GetPrinterOptions()); - wxString filename(m_printData.GetFilename()); + wxString command; + command += m_printData.GetPrinterCommand(); + command += wxT(" "); + command += m_printData.GetFilename(); - switch (m_printData.GetPrintMode()) - { - case wxPRINT_MODE_PREVIEW: - { - wxChar *argv[3]; - argv[0] = WXSTRINGCAST previewCommand; - argv[1] = WXSTRINGCAST filename; - argv[2] = (wxChar*) NULL; -#if defined(__WXGTK20__) && wxUSE_UNICODE -#else - wxExecute( argv, TRUE ); -#endif - wxRemoveFile( m_printData.GetFilename() ); - } - break; - case wxPRINT_MODE_PRINTER: - { - wxChar *argv[4]; - int argc = 0; - argv[argc++] = WXSTRINGCAST printerCommand; - - // !SM! If we simply assign to argv[1] here, if printer options - // are blank, we get an annoying and confusing message from lpr. - wxChar *opts = WXSTRINGCAST printerOptions; - if (opts && *opts) - argv[argc++] = opts; - - argv[argc++] = WXSTRINGCAST filename; - argv[argc++] = (wxChar *) NULL; -#if defined(__WXGTK20__) && wxUSE_UNICODE -#else - wxExecute( argv, TRUE ); -#endif - wxRemoveFile( filename ); - } - break; - case wxPRINT_MODE_FILE: - case wxPRINT_MODE_NONE: - break; - } + wxExecute( command, TRUE ); + wxRemoveFile( m_printData.GetFilename() ); } #endif } @@ -2141,6 +1984,53 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") ); + if (string.IsEmpty()) + { + 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(); #if !wxUSE_AFM_FOR_POSTSCRIPT @@ -2210,97 +2100,72 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, double UnderlinePosition = 0.0; double UnderlineThickness = 0.0; - /* get actual parameters */ + // Get actual parameters int Family = fontToUse->GetFamily(); int Size = fontToUse->GetPointSize(); int Style = fontToUse->GetStyle(); int Weight = fontToUse->GetWeight(); - /* if we have another font, read the font-metrics */ + // If we have another font, read the font-metrics if (Family!=lastFamily || Size!=lastSize || Style!=lastStyle || Weight!=lastWeight) { - /* store actual values */ + // Store actual values lastFamily = Family; lastSize = Size; lastStyle = Style; lastWeight = Weight; - const char *name = NULL; + const wxChar *name = NULL; switch (Family) { case wxMODERN: case wxTELETYPE: { - if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "CourBoO.afm"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "CourBo.afm"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "CourO.afm"; - else name = "Cour.afm"; + if ((Style == wxITALIC) && (Weight == wxBOLD)) name = wxT("CourBoO.afm"); + else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = wxT("CourBo.afm"); + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = wxT("CourO.afm"); + else name = wxT("Cour.afm"); break; } case wxROMAN: { - if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "TimesBoO.afm"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "TimesBo.afm"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "TimesO.afm"; - else name = "TimesRo.afm"; + if ((Style == wxITALIC) && (Weight == wxBOLD)) name = wxT("TimesBoO.afm"); + else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = wxT("TimesBo.afm"); + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = wxT("TimesO.afm"); + else name = wxT("TimesRo.afm"); break; } case wxSCRIPT: { - name = "Zapf.afm"; + name = wxT("Zapf.afm"); Style = wxNORMAL; Weight = wxNORMAL; } case wxSWISS: default: { - if ((Style == wxITALIC) && (Weight == wxBOLD)) name = "HelvBoO.afm"; - else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = "HelvBo.afm"; - else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = "HelvO.afm"; - else name = "Helv.afm"; + if ((Style == wxITALIC) && (Weight == wxBOLD)) name = wxT("HelvBoO.afm"); + else if ((Style != wxITALIC) && (Weight == wxBOLD)) name = wxT("HelvBo.afm"); + else if ((Style == wxITALIC) && (Weight != wxBOLD)) name = wxT("HelvO.afm"); + else name = wxT("Helv.afm"); break; } } - /* get the directory of the AFM files */ - wxString afmName = wxEmptyString; + FILE *afmFile = NULL; + + // Get the directory of the AFM files + wxString afmName; if (!m_printData.GetFontMetricPath().IsEmpty()) { afmName = m_printData.GetFontMetricPath(); - } - - /* 2. open and process the file - / a short explanation of the AFM format: - / we have for each character a line, which gives its size - / e.g.: - / - / C 63 ; WX 444 ; N question ; B 49 -14 395 676 ; - / - / that means, we have a character with ascii code 63, and width - / (444/1000 * fontSize) points. - / the other data is ignored for now! - / - / when the font has changed, we read in the right AFM file and store the - / character widths in an array, which is processed below (see point 3.). */ - - /* new elements JC Sun Aug 25 23:21:44 MET DST 1996 */ - - afmName << name; - FILE *afmFile = wxFopen(afmName,wxT("r")); - - if (afmFile==NULL) - { - afmName = wxThePrintSetupData->GetAFMPath(); - afmName << wxFILE_SEP_PATH << name; - afmFile = wxFopen(afmName,wxT("r")); + afmName << wxFILE_SEP_PATH << name; + afmFile = wxFopen(afmName,wxT("r")); } #if defined(__UNIX__) && !defined(__VMS__) - if (afmFile==NULL) - /* please do NOT change the line above to "else if (afmFile==NULL)" - - - afmFile = fopen() may fail and in that case the next if branch - MUST be executed - and it would not if there was "else" */ + if (afmFile==NULL) { afmName = wxGetDataDir(); afmName << wxFILE_SEP_PATH @@ -2314,6 +2179,19 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, } #endif + /* 2. open and process the file + / a short explanation of the AFM format: + / we have for each character a line, which gives its size + / e.g.: + / + / C 63 ; WX 444 ; N question ; B 49 -14 395 676 ; + / + / that means, we have a character with ascii code 63, and width + / (444/1000 * fontSize) points. + / the other data is ignored for now! + / + / when the font has changed, we read in the right AFM file and store the + / character widths in an array, which is processed below (see point 3.). */ if (afmFile==NULL) { wxLogDebug( wxT("GetTextExtent: can't open AFM file '%s'"), afmName.c_str() ); @@ -2477,365 +2355,29 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, /* currently no idea how to calculate this! */ if (externalLeading) *externalLeading = 0; - -#endif -} - -// Determine the Default Postscript Previewer -// available on the platform -#if defined(__SUN__) && defined(__XVIEW__) -// OpenWindow/NeWS's Postscript Previewer -# define PS_VIEWER_PROG "pageview" -#elif defined(__VMS__) -#define PS_VIEWER_PROG "view/format=ps/select=x_display" -#elif defined(__SGI__) -// SGI's Display Postscript Previewer -//# define PS_VIEWER_PROG "dps" -# define PS_VIEWER_PROG "xpsview" -#elif defined(__X__) || defined(__WXGTK__) -// Front-end to ghostscript -# define PS_VIEWER_PROG "ghostview" -#else -// Windows ghostscript/ghostview -# define PS_VIEWER_PROG "gsview" #endif + // Use AFM -wxPrintSetupData *wxThePrintSetupData = (wxPrintSetupData *) NULL; - -IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) -IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject) - -// Redundant now I think -#if 1 -IMPLEMENT_CLASS(wxPostScriptPrintDialog, wxDialog) - -wxPostScriptPrintDialog::wxPostScriptPrintDialog (wxWindow *parent, const wxString& title, - const wxPoint& pos, const wxSize& size, wxCoord style): - wxDialog(parent, -1, title, pos, size, style) -{ - wxBeginBusyCursor(); - - char buf[100]; - int yPos = 40; - wxString - *orientation = new wxString[2], - *print_modes = new wxString[3]; - int features; - wxCoord wx_printer_translate_x, wx_printer_translate_y; - double wx_printer_scale_x, wx_printer_scale_y; - - orientation[0] = _("Portrait"); - orientation[1] = _("Landscape"); - - print_modes[0] = _("Send to Printer"); - print_modes[1] = _("Print to File"); - print_modes[2] = _("Preview Only"); - - - - wxButton *okBut = new wxButton (this, wxID_OK, _("OK"), wxPoint(5, 5)); - (void) new wxButton (this, wxID_CANCEL, _("Cancel"), wxPoint(40, 5)); - okBut->SetDefault(); - - -#if defined(__WXGTK__) || defined (__WXMOTIF__) - (void) new wxStaticText( this, -1, _("Printer Command: "), - wxPoint(5, yPos) ); - (void) new wxTextCtrl( this, wxID_PRINTER_COMMAND, wxThePrintSetupData->GetPrinterCommand(), - wxPoint(100, yPos), wxSize(100, -1) ); - - (void) new wxStaticText( this, -1, _("Printer Options: "), - wxPoint(210, yPos) ); - (void) new wxTextCtrl( this, wxID_PRINTER_OPTIONS, wxThePrintSetupData->GetPrinterOptions(), - wxPoint(305, yPos), wxSize(150, -1) ); - - yPos += 40; -#endif - - - wxRadioBox *radio0 = new wxRadioBox(this, wxID_PRINTER_ORIENTATION, "Orientation: ", wxPoint(5, yPos), wxSize(-1,-1), - 2,orientation,2,wxRA_SPECIFY_ROWS); - radio0->SetSelection((int)wxThePrintSetupData->GetPrinterOrientation() - 1); - - // @@@ Configuration hook - if ( !wxThePrintSetupData->GetPrintPreviewCommand() ) - wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG); - - // wxGetResource ("wxWindows", "PSView", &wxThePrintSetupData->m_previewCommand); - - features = (wxThePrintSetupData->GetPrintPreviewCommand() && - *wxThePrintSetupData->GetPrintPreviewCommand()) ? 3 : 2; - - wxRadioBox *radio1 = new wxRadioBox(this, wxID_PRINTER_MODES, _("PostScript:"), - wxPoint(150, yPos), - wxSize(-1,-1), features, - print_modes, features, wxRA_SPECIFY_ROWS); - -#ifdef __WXMSW__ - radio1->Enable(0, FALSE); - if (wxThePrintSetupData->GetPrintPreviewCommand() && *wxThePrintSetupData->GetPrintPreviewCommand()) - radio1->Enable(2, FALSE); #endif - - radio1->SetSelection((int)wxThePrintSetupData->GetPrinterMode()); - wxThePrintSetupData->GetPrinterTranslation(&wx_printer_translate_x, &wx_printer_translate_y); - wxThePrintSetupData->GetPrinterScaling(&wx_printer_scale_x, &wx_printer_scale_y); - - sprintf (buf, "%.2f", wx_printer_scale_x); - - yPos += 90; - (void) new wxStaticText(this, -1, _("X Scaling"), wxPoint(5, yPos)); - /* wxTextCtrl *text1 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_SCALE, buf, wxPoint(100, yPos), wxSize(100, -1)); - - sprintf (buf, "%.2f", wx_printer_scale_y); - (void) new wxStaticText(this, -1, _("Y Scaling"), wxPoint(220, yPos)); - /* wxTextCtrl *text2 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_SCALE, buf, wxPoint(320, yPos), wxSize(100, -1)); - - yPos += 25; - - (void) new wxStaticText(this, -1, _("X Translation"), wxPoint(5, yPos)); - sprintf (buf, "%.2d", wx_printer_translate_x); - /* wxTextCtrl *text3 = */ (void) new wxTextCtrl(this, wxID_PRINTER_X_TRANS, buf, wxPoint(100, yPos), wxSize(100, -1)); - - (void) new wxStaticText(this, -1, _("Y Translation"), wxPoint(220, yPos)); - sprintf (buf, "%.2d", wx_printer_translate_y); - /* wxTextCtrl *text4 = */ (void) new wxTextCtrl(this, wxID_PRINTER_Y_TRANS, buf, wxPoint(320, yPos), wxSize(100, -1)); - - Fit (); - - delete[] orientation; - delete[] print_modes; - - wxEndBusyCursor(); -} - -int wxPostScriptPrintDialog::ShowModal () -{ - if ( wxDialog::ShowModal() == wxID_OK ) - { -// wxTextCtrl *text0 = (wxTextCtrl *)FindWindow(wxID_PRINTER_OPTIONS); - wxTextCtrl *text1 = (wxTextCtrl *)FindWindow(wxID_PRINTER_X_SCALE); - wxTextCtrl *text2 = (wxTextCtrl *)FindWindow(wxID_PRINTER_Y_SCALE); - wxTextCtrl *text3 = (wxTextCtrl *)FindWindow(wxID_PRINTER_X_TRANS); - wxTextCtrl *text4 = (wxTextCtrl *)FindWindow(wxID_PRINTER_Y_TRANS); -// wxTextCtrl *text_prt = (wxTextCtrl *)FindWindow(wxID_PRINTER_COMMAND); - wxRadioBox *radio0 = (wxRadioBox *)FindWindow(wxID_PRINTER_ORIENTATION); - wxRadioBox *radio1 = (wxRadioBox *)FindWindow(wxID_PRINTER_MODES); - - StringToDouble (WXSTRINGCAST text1->GetValue (), &wxThePrintSetupData->m_printerScaleX); - StringToDouble (WXSTRINGCAST text2->GetValue (), &wxThePrintSetupData->m_printerScaleY); - - long dummy; - StringToLong (WXSTRINGCAST text3->GetValue (), &dummy); - wxThePrintSetupData->m_printerTranslateX = (wxCoord)dummy; - StringToLong (WXSTRINGCAST text4->GetValue (), &dummy); - wxThePrintSetupData->m_printerTranslateY = (wxCoord)dummy; - -#ifdef __X__ - // wxThePrintSetupData->SetPrinterOptions(WXSTRINGCAST text0->GetValue ()); - // wxThePrintSetupData->SetPrinterCommand(WXSTRINGCAST text_prt->GetValue ()); -#endif - - wxThePrintSetupData->SetPrinterOrientation((radio0->GetSelection() == 1 ? wxLANDSCAPE : wxPORTRAIT)); - - // C++ wants this - switch ( radio1->GetSelection() ) { - case 0: wxThePrintSetupData->SetPrinterMode(PS_PRINTER); break; - case 1: wxThePrintSetupData->SetPrinterMode(PS_FILE); break; - case 2: wxThePrintSetupData->SetPrinterMode(PS_PREVIEW); break; - } - return wxID_OK; - } - return wxID_CANCEL; -} -#endif - // 0 (redundant) - -// PostScript printer settings -// RETAINED FOR BACKWARD COMPATIBILITY -void wxSetPrinterCommand(const wxString& cmd) -{ - wxThePrintSetupData->SetPrinterCommand(cmd); -} - -void wxSetPrintPreviewCommand(const wxString& cmd) -{ - wxThePrintSetupData->SetPrintPreviewCommand(cmd); -} - -void wxSetPrinterOptions(const wxString& flags) -{ - wxThePrintSetupData->SetPrinterOptions(flags); -} - -void wxSetPrinterFile(const wxString& f) -{ - wxThePrintSetupData->SetPrinterFile(f); -} - -void wxSetPrinterOrientation(int orient) -{ - wxThePrintSetupData->SetPrinterOrientation(orient); -} - -void wxSetPrinterScaling(double x, double y) -{ - wxThePrintSetupData->SetPrinterScaling(x, y); -} - -void wxSetPrinterTranslation(wxCoord x, wxCoord y) -{ - wxThePrintSetupData->SetPrinterTranslation(x, y); -} - -// 1 = Preview, 2 = print to file, 3 = send to printer -void wxSetPrinterMode(int mode) -{ - wxThePrintSetupData->SetPrinterMode(mode); -} - -void wxSetAFMPath(const wxString& f) -{ - wxThePrintSetupData->SetAFMPath(f); -} - -// Get current values -wxString wxGetPrinterCommand() -{ - return wxThePrintSetupData->GetPrinterCommand(); -} - -wxString wxGetPrintPreviewCommand() -{ - return wxThePrintSetupData->GetPrintPreviewCommand(); -} - -wxString wxGetPrinterOptions() -{ - return wxThePrintSetupData->GetPrinterOptions(); -} - -wxString wxGetPrinterFile() -{ - return wxThePrintSetupData->GetPrinterFile(); -} - -int wxGetPrinterOrientation() -{ - return wxThePrintSetupData->GetPrinterOrientation(); -} - -void wxGetPrinterScaling(double* x, double* y) -{ - wxThePrintSetupData->GetPrinterScaling(x, y); -} - -void wxGetPrinterTranslation(wxCoord *x, wxCoord *y) -{ - wxThePrintSetupData->GetPrinterTranslation(x, y); -} - -int wxGetPrinterMode() -{ - return wxThePrintSetupData->GetPrinterMode(); -} - -wxString wxGetAFMPath() -{ - return wxThePrintSetupData->GetAFMPath(); -} - -/* - * Print setup data - */ - -wxPrintSetupData::wxPrintSetupData() -{ - m_printerOrient = wxPORTRAIT; - m_printerScaleX = (double)1.0; - m_printerScaleY = (double)1.0; - m_printerTranslateX = 0; - m_printerTranslateY = 0; - m_printerMode = wxPRINT_MODE_FILE; - m_printColour = TRUE; + // GTK 2.0 } -wxPrintSetupData::~wxPrintSetupData() -{ -} - -void wxPrintSetupData::operator=(wxPrintSetupData& data) -{ - SetPrinterCommand(data.GetPrinterCommand()); - SetPrintPreviewCommand(data.GetPrintPreviewCommand()); - SetPrinterOptions(data.GetPrinterOptions()); - wxCoord x, y; - data.GetPrinterTranslation(&x, &y); - SetPrinterTranslation(x, y); - - double x1, y1; - data.GetPrinterScaling(&x1, &y1); - SetPrinterScaling(x1, y1); - - SetPrinterOrientation(data.GetPrinterOrientation()); - SetPrinterMode(data.GetPrinterMode()); - SetAFMPath(data.GetAFMPath()); - SetPaperName(data.GetPaperName()); - SetColour(data.GetColour()); -} - -// Initialize from a wxPrintData object (wxPrintData should now be used instead of wxPrintSetupData). -void wxPrintSetupData::operator=(const wxPrintData& data) -{ - SetPrinterCommand(data.GetPrinterCommand()); - SetPrintPreviewCommand(data.GetPreviewCommand()); - SetPrinterOptions(data.GetPrinterOptions()); - SetPrinterTranslation((wxCoord)data.GetPrinterTranslateX(), - (wxCoord)data.GetPrinterTranslateY()); - SetPrinterScaling(data.GetPrinterScaleX(), data.GetPrinterScaleY()); - SetPrinterOrientation(data.GetOrientation()); - SetPrinterMode((int) data.GetPrintMode()); - SetAFMPath(data.GetFontMetricPath()); - SetPaperName(wxThePrintPaperDatabase->ConvertIdToName(data.GetPaperId())); - SetColour(data.GetColour()); - SetPrinterFile(data.GetFilename()); -} +#if WXWIN_COMPATIBILITY_2_2 +WXDLLEXPORT wxPrintSetupData *wxThePrintSetupData = 0; void wxInitializePrintSetupData(bool init) { - if (init) - { - wxThePrintSetupData = new wxPrintSetupData; - - wxThePrintSetupData->SetPrintPreviewCommand(PS_VIEWER_PROG); - wxThePrintSetupData->SetPrinterOrientation(wxPORTRAIT); - wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PREVIEW); - wxThePrintSetupData->SetPaperName(_("A4 sheet, 210 x 297 mm")); - - // Could have a .ini file to read in some defaults - // - and/or use environment variables, e.g. WXWIN -#ifdef __VMS__ - wxThePrintSetupData->SetPrinterCommand("print"); - wxThePrintSetupData->SetPrinterOptions("/nonotify/queue=psqueue"); - wxThePrintSetupData->SetAFMPath("sys$ps_font_metrics:"); -#endif -#ifdef __WXMSW__ - wxThePrintSetupData->SetPrinterCommand("print"); - wxThePrintSetupData->SetAFMPath("c:\\windows\\system\\"); - wxThePrintSetupData->SetPrinterOptions(""); -#endif -#if !defined(__VMS__) && !defined(__WXMSW__) - wxThePrintSetupData->SetPrinterCommand("lpr"); - wxThePrintSetupData->SetPrinterOptions(""); - wxThePrintSetupData->SetAFMPath(""); -#endif - } - else - { - if (wxThePrintSetupData) - delete wxThePrintSetupData; - wxThePrintSetupData = (wxPrintSetupData *) NULL; - } + 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 @@ -2852,10 +2394,6 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxPostScriptModule, wxModule) -/* - * Initialization/cleanup module - */ - bool wxPostScriptModule::OnInit() { wxInitializePrintSetupData(); @@ -2867,9 +2405,14 @@ void wxPostScriptModule::OnExit() { wxInitializePrintSetupData(FALSE); } +#endif + // WXWIN_COMPATIBILITY_2_2 #endif // wxUSE_POSTSCRIPT #endif // wxUSE_PRINTING_ARCHITECTURE + + +// vi:sts=4:sw=4:et