Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2008-01-18 21:37:46 +00:00
parent 4c40473a23
commit 8eb7181ca7
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/os2/dc.cpp
View File

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