X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a70d3f578cdd6939616505d5a38c001a5cc7692..797e38dde12c5dc2d99070eef25d9b8c2549d621:/src/common/prntbase.cpp

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 43d3a361d2..9ca0f726c3 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -34,6 +34,7 @@
     #include "wx/button.h"
     #include "wx/settings.h"
     #include "wx/dcmemory.h"
+    #include "wx/dcclient.h"
     #include "wx/stattext.h"
     #include "wx/intl.h"
     #include "wx/textdlg.h"
@@ -732,28 +733,42 @@ wxRect wxPrintout::GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSe
     // Return the rectangle in logical units that corresponds to the region
     // within the page margins as specified by the given wxPageSetupDialogData
     // object.
-    wxRect paperRect = GetPaperRectPixels();
+    
+    // We get the paper size in device units and the margins in mm,
+    // so we need to calculate the conversion with this trick
     wxCoord pw, ph;
     GetPageSizePixels(&pw, &ph);
-    wxPoint topLeft = pageSetupData.GetMarginTopLeft();
-    wxPoint bottomRight = pageSetupData.GetMarginBottomRight();
     wxCoord mw, mh;
     GetPageSizeMM(&mw, &mh);
     float mmToDeviceX = float(pw) / mw;
     float mmToDeviceY = float(ph) / mh;
-    wxRect pageMarginsRect(paperRect.x + wxRound(mmToDeviceX * topLeft.x),
-        paperRect.y + wxRound(mmToDeviceY * topLeft.y),
-        paperRect.width - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)),
+
+    // paper size in device units    
+    wxRect paperRect = GetPaperRectPixels();
+    
+    // margins in mm
+    wxPoint topLeft = pageSetupData.GetMarginTopLeft();
+    wxPoint bottomRight = pageSetupData.GetMarginBottomRight();
+    
+    // calculate margins in device units
+    wxRect pageMarginsRect(
+        paperRect.x      + wxRound(mmToDeviceX * topLeft.x),
+        paperRect.y      + wxRound(mmToDeviceY * topLeft.y),
+        paperRect.width  - wxRound(mmToDeviceX * (topLeft.x + bottomRight.x)),
         paperRect.height - wxRound(mmToDeviceY * (topLeft.y + bottomRight.y)));
+        
     wxCoord w, h;
     m_printoutDC->GetSize(&w, &h);
-    if (w == pw && h == ph) {
+    if (w == pw && h == ph) 
+    {
         // this DC matches the printed page, so no scaling
-        return wxRect(m_printoutDC->DeviceToLogicalX(pageMarginsRect.x), 
+        return wxRect(
+            m_printoutDC->DeviceToLogicalX(pageMarginsRect.x), 
             m_printoutDC->DeviceToLogicalY(pageMarginsRect.y), 
             m_printoutDC->DeviceToLogicalXRel(pageMarginsRect.width), 
             m_printoutDC->DeviceToLogicalYRel(pageMarginsRect.height));
     }
+    
     // This DC doesn't match the printed page, so we have to scale.
     float scaleX = float(w) / pw;
     float scaleY = float(h) / ph;
@@ -766,17 +781,18 @@ wxRect wxPrintout::GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSe
 void wxPrintout::SetLogicalOrigin(wxCoord x, wxCoord y)
 {
     // Set the device origin by specifying a point in logical coordinates.
-    m_printoutDC->SetDeviceOrigin(m_printoutDC->LogicalToDeviceX(x), 
-        m_printoutDC->LogicalToDeviceY(y));
+    m_printoutDC->SetDeviceOrigin(
+        m_printoutDC->LogicalToDeviceX(x), 
+        m_printoutDC->LogicalToDeviceY(y) );
 }
     
 void wxPrintout::OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff)
 {
     // Offset the device origin by a specified distance in device coordinates.
-    wxCoord x = m_printoutDC->LogicalToDeviceX(0);
-    wxCoord y = m_printoutDC->LogicalToDeviceY(0);
-    m_printoutDC->SetDeviceOrigin(x + m_printoutDC->LogicalToDeviceXRel(xoff), 
-        y + m_printoutDC->LogicalToDeviceYRel(yoff));
+    wxPoint dev_org = m_printoutDC->GetDeviceOrigin();
+    m_printoutDC->SetDeviceOrigin(
+        dev_org.x + m_printoutDC->LogicalToDeviceXRel(xoff), 
+        dev_org.y + m_printoutDC->LogicalToDeviceYRel(yoff) );
 }
     
 
@@ -862,20 +878,14 @@ void wxPreviewCanvas::OnSysColourChanged(wxSysColourChangedEvent& event)
 void wxPreviewCanvas::OnChar(wxKeyEvent &event)
 {
     wxPreviewControlBar* controlBar = ((wxPreviewFrame*) GetParent())->GetControlBar();
-    if (event.GetKeyCode() == WXK_ESCAPE)
-    {
-        ((wxPreviewFrame*) GetParent())->Close(true);
-        return;
-    }
-    else if (event.GetKeyCode() == WXK_TAB)
-    {
-        controlBar->OnGoto();
-        return;
-    }
-    else if (event.GetKeyCode() == WXK_RETURN)
+    switch (event.GetKeyCode())
     {
-        controlBar->OnPrint();
-        return;
+        case WXK_TAB:
+            controlBar->OnGoto();
+            return;
+        case WXK_RETURN:
+            controlBar->OnPrint();
+            return;
     }
 
     if (!event.ControlDown())
@@ -1208,9 +1218,22 @@ int wxPreviewControlBar::GetZoomControl()
 IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
 
 BEGIN_EVENT_TABLE(wxPreviewFrame, wxFrame)
+    EVT_CHAR_HOOK(wxPreviewFrame::OnChar)
     EVT_CLOSE(wxPreviewFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
+void wxPreviewFrame::OnChar(wxKeyEvent &event)
+{
+    if ( event.GetKeyCode() == WXK_ESCAPE )
+    {
+        Close(true);
+    }
+    else
+    {
+        event.Skip();
+    }
+}
+
 wxPreviewFrame::wxPreviewFrame(wxPrintPreviewBase *preview, wxWindow *parent, const wxString& title,
                                const wxPoint& pos, const wxSize& size, long style, const wxString& name):
 wxFrame(parent, wxID_ANY, title, pos, size, style, name)