// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#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>
} 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"
IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
-float wxPostScriptDC::ms_PSScaleFactor = 10.0;
+float wxPostScriptDC::ms_PSScaleFactor = 1.0;
void wxPostScriptDC::SetResolution(int ppi)
{
}
}
+#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;
m_font = font;
-#ifndef __WXGTK20__
+#if wxUSE_PANGO
+#else
int Style = m_font.GetStyle();
int Weight = m_font.GetWeight();
for (int i = 0; i < 100; i++)
if (buffer[i] == ',') buffer[i] = '.';
fprintf( m_pstream, buffer );
+
#endif
}
}
}
-#ifdef __WXGTK20__
+#if wxUSE_PANGO
#define PANGO_ENABLE_ENGINE
+#ifdef __WXGTK20__
#include "wx/gtk/private.h"
-#include "wx/fontutil.h"
#include "gtk/gtk.h"
-//#include "gtk/gdk/gdkx.h"
-//#include <pango/pangoxft.h>
+#else
+#include "wx/x11/private.h"
+#endif
+
+#include "wx/fontutil.h"
#include <pango/pangoft2.h>
#include <freetype/ftglyph.h>
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;
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;
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 ,
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 ,
return 0;
}
-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,
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 1.0 72.0 div dup scale 0 0 0 setrgbcolor\n", pos_x, pos_y );
+ 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, "closepath fill grestore \n");
+ fprintf(file, "closepath fill grestore\n");
FT_Done_Glyph (glyph);
}
{
wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
-#ifdef __WXGTK20__
+ 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] = '.';
+ fprintf( m_pstream, buffer );
- int dpi = GetResolution();
+ 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 );
- PangoContext *context = pango_ft2_get_context ( dpi, 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 = pango_layout_new (context);
#if wxUSE_UNICODE
wxCharBuffer buffer = wxConvUTF8.cWC2MB( text );
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 );
-#if 1
- int xx = LogicalToDeviceX(x);
- int yy = LogicalToDeviceY(y /*+ bitmap.GetHeight()*/ );
+ PangoRectangle rect;
+ pango_layout_get_extents(layout, NULL, &rect);
- xx *= PANGO_SCALE;
- yy *= PANGO_SCALE;
+ 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 );
{
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)
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;
+ 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, dpi, ft_face,
+ draw_bezier_outline( m_pstream, ft_face,
(FT_UInt)(glyphs->glyphs[glyph_idx].glyph),
- (wxCoord)(pos_x / PANGO_SCALE), (wxCoord)(pos_y / PANGO_SCALE) );
+ 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;
// 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();
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);
double a, b, 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;
CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 );
CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 );
- while ((node = node->Next()) != NULL)
+ while ((node = node->GetNext()))
{
- q = (wxPoint *)node->Data();
+ q = (wxPoint *)node->GetData();
x1 = x3;
y1 = y3;
{
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);
}
else
fprintf( m_pstream, "%%%%Orientation: Portrait\n" );
- // wxPaperSize ps = m_printData.GetPaperId();
- // if (ps == ...)
- fprintf( m_pstream, "%%%%DocumentPaperSizes: %s\n", "A4" );
+ // fprintf( m_pstream, "%%%%Pages: %d\n", (wxPageNumber - 1) );
+
+ const char *paper;
+ 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, wxPostScriptHeaderEllipse );
fprintf( m_pstream, wxPostScriptHeaderEllipticArc );
fprintf( m_pstream, wxPostScriptHeaderColourImage );
-#ifndef __WXGTK20__
+#if wxUSE_PANGO
+#else
fprintf( m_pstream, wxPostScriptHeaderReencodeISO1 );
fprintf( m_pstream, wxPostScriptHeaderReencodeISO2 );
#endif
m_pstream = (FILE *) NULL;
#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;
"%%%%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) );
// To check the correctness of the bounding box, postscript commands
// to draw a box corresponding to the bounding box are generated below.
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 );
+#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());
-
- 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;
- }
+ wxString command;
+ command += m_printData.GetPrinterCommand();
+ command += wxT(" ");
+ command += m_printData.GetPrinterOptions();
+ command += wxT(" ");
+ command += m_printData.GetFilename();
+
+ wxExecute( command, TRUE );
+ wxRemoveFile( m_printData.GetFilename() );
}
#endif
-
-#endif
}
void wxPostScriptDC::StartPage()
wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") );
+ if (string.IsEmpty())
+ {
+ if (x) (*x) = 0;
+ if (y) (*y) = 0;
+ if (descent) (*descent) = 0;
+ if (externalLeading) (*externalLeading) = 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
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;
}
}
/ 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
{
/* currently no idea how to calculate this! */
if (externalLeading) *externalLeading = 0;
+#endif
+ // Use AFM
#endif
+ // GTK 2.0
}
+#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
#endif
// wxUSE_PRINTING_ARCHITECTURE
+
+
+// vi:sts=4:sw=4:et
projects / wxWidgets.git / blobdiff