X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3603a8ffbde56d1f6a2f38991b97313cff5076ce..81c9effa8462662263c3b4eac2cfae1ef5caae2c:/src/common/cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index b0b0727f8f..2fe0f2ff51 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -129,7 +129,7 @@ wxColourData::~wxColourData()
 {
 }
 
-void wxColourData::SetCustomColour(int i, wxColour& colour)
+void wxColourData::SetCustomColour(int i, const wxColour& colour)
 {
     if (i > 15 || i < 0)
         return;
@@ -1512,12 +1512,9 @@ void wxPageSetupDialogData::CalculatePaperSizeFromId()
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
-    if (sz.x != 0)
-    {
-        // sz is in 10ths of a mm, so multiply by 10.
-        m_paperSize.x = sz.x * 10;
-        m_paperSize.y = sz.y * 10;
-    }
+    // sz is in 10ths of a mm, while paper size is in mm
+    m_paperSize.x = sz.x / 10;
+    m_paperSize.y = sz.y / 10;
 }
 
 #endif // wxUSE_PRINTING_ARCHITECTURE