AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix printing in landscape mode in wxGTK.

Browse Source 
Only apply Cairo transforms in StartPage(), doing it earlier interferes with
the code doing the coordinate system rotation inside GTK+ itself when a
non-portrait printing mode is used.

Closes #14732.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2012-10-09 21:01:29 +00:00
parent bf47204759
commit 8d489a5e4b
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -575,6 +575,7 @@ wxGTK:
- Generate clipboard events for wxComboBox and not only wxTextCtrl.
- Improve drag-and-drop of URLs.
- Make key event handling consistent with wxMSW (John Rails).
- Fix printing in landscape mode (Marcin Wojdyr).
wxMSW:

30
src/gtk/print.cpp
View File

@ -1179,8 +1179,6 @@ wxGtkPrinterDCImpl::wxGtkPrinterDCImpl(wxPrinterDC *owner, const wxPrintData& da
#if wxCAIRO_SCALE
m_PS2DEV = 1.0;
m_DEV2PS = 1.0;
cairo_scale( m_cairo, 72.0 / (double)m_resolution, 72.0 / (double)m_resolution );
#else
m_PS2DEV = (double)m_resolution / 72.0;
m_DEV2PS = 72.0 / (double)m_resolution;
@ -1192,15 +1190,6 @@ wxGtkPrinterDCImpl::wxGtkPrinterDCImpl(wxPrinterDC *owner, const wxPrintData& da
m_signX = 1; // default x-axis left to right.
m_signY = 1; // default y-axis bottom up -> top down.
// By default the origin of the Cairo context is in the upper left
// corner of the printable area. We need to translate it so that it
// is in the upper left corner of the paper (without margins)
GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
gdouble ml, mt;
ml = gtk_page_setup_get_left_margin (setup, GTK_UNIT_POINTS);
mt = gtk_page_setup_get_top_margin (setup, GTK_UNIT_POINTS);
cairo_translate(m_cairo, -ml, -mt);
}
wxGtkPrinterDCImpl::~wxGtkPrinterDCImpl()
@ -2102,7 +2091,24 @@ void wxGtkPrinterDCImpl::EndDoc()
void wxGtkPrinterDCImpl::StartPage()
{
return;
// Notice that we may change the Cairo transformation matrix only here and
// not before (e.g. in wxGtkPrinterDCImpl ctor as we used to do) in order
// to not affect _gtk_print_context_rotate_according_to_orientation() which
// is used in GTK+ itself and wouldn't work correctly if we applied these
// transformations before it is called.
// By default the origin of the Cairo context is in the upper left
// corner of the printable area. We need to translate it so that it
// is in the upper left corner of the paper (without margins)
GtkPageSetup *setup = gtk_print_context_get_page_setup( m_gpc );
gdouble ml, mt;
ml = gtk_page_setup_get_left_margin (setup, GTK_UNIT_POINTS);
mt = gtk_page_setup_get_top_margin (setup, GTK_UNIT_POINTS);
cairo_translate(m_cairo, -ml, -mt);
#if wxCAIRO_SCALE
cairo_scale( m_cairo, 72.0 / (double)m_resolution, 72.0 / (double)m_resolution );
#endif
}
void wxGtkPrinterDCImpl::EndPage()