From: Stefan Neis <Stefan.Neis@t-online.de>
Date: Fri, 18 Jan 2008 21:37:46 +0000 (+0000)
Subject: Fixed errors in OS/2's wxDC::SetMapMode (patch #1871556, needed for Filezilla).
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8eb7181ca7a825d544c3bc590bf0d82a5f002be9?ds=sidebyside

Fixed errors in OS/2's wxDC::SetMapMode (patch #1871556, needed for Filezilla).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index aa54c8a48a..9fb6ea2f9d 100644
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -2218,13 +2218,13 @@ void wxPMDCImpl::SetMapMode(
     int                             nPixelHeight = 0;
     int                             nMmWidth = 1;
     int                             nMmHeight = 1;
-    LONG                            lArray[CAPS_VERTICAL_RESOLUTION];
+    LONG                            lArray[CAPS_VERTICAL_RESOLUTION+1];
 
     m_mappingMode = nMode;
 
     if(::DevQueryCaps( m_hDC
-                      ,CAPS_FAMILY
-                      ,CAPS_VERTICAL_RESOLUTION
+                      ,CAPS_FAMILY                  // id of first item
+                      ,CAPS_VERTICAL_RESOLUTION+1   // number of items wanted
                       ,lArray
                      ))
     {
@@ -2236,15 +2236,15 @@ void wxPMDCImpl::SetMapMode(
         lHorzRes  = lArray[CAPS_HORIZONTAL_RESOLUTION]; // returns pel/meter
         lVertRes  = lArray[CAPS_VERTICAL_RESOLUTION];   // returns pel/meter
         nMmWidth  = (lHorzRes/1000) * nPixelWidth;
-        nMmWidth = (lVertRes/1000) * nPixelHeight;
+        nMmHeight = (lVertRes/1000) * nPixelHeight;
     }
     if ((nPixelWidth == 0) || (nPixelHeight == 0) || (nMmWidth == 0) || (nMmHeight == 0))
     {
         return;
     }
 
-    double                          dMm2pixelsX = nPixelWidth/nMmWidth;
-    double                          dMm2pixelsY = nPixelHeight/nMmHeight;
+    double dMm2pixelsX = nPixelWidth/(double)nMmWidth;
+    double dMm2pixelsY = nPixelHeight/(double)nMmHeight;
 
     switch (nMode)
     {
@@ -2274,6 +2274,7 @@ void wxPMDCImpl::SetMapMode(
             m_logicalScaleY = 1.0;
             break;
     }
+
     SIZEL                           vSize;
     ULONG                           ulOptions;
 
@@ -2283,10 +2284,6 @@ void wxPMDCImpl::SetMapMode(
         ulOptions = PU_ARBITRARY | GPIF_DEFAULT;
         ::GpiSetPS(m_hPS, &vSize, ulOptions);
     }
-    m_nWindowExtX = (int)MS_XDEV2LOG(VIEWPORT_EXTENT);
-    m_nWindowExtY = (int)MS_YDEV2LOG(VIEWPORT_EXTENT);
-    // ????
-    
     ComputeScaleAndOrigin();
     
 }; // end of wxPMDCImpl::SetMapMode