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/branches/WX_2_8_BRANCH@51280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2008-01-18 21:38:26 +00:00
parent 19d59a461f
commit e5a898b54d
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/os2/dc.cpp
View File

@@ -2228,13 +2228,13 @@ void wxDC::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
))
{
@@ -2246,15 +2246,15 @@ void wxDC::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)
{
@@ -2284,6 +2284,7 @@ void wxDC::SetMapMode(
m_logicalScaleY = 1.0;
break;
}
SIZEL vSize;
ULONG ulOptions;
@@ -2293,9 +2294,6 @@ void wxDC::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);
// ????
}; // end of wxDC::SetMapMode
void wxDC::SetUserScale( double dX,