projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documenting WX_MONOLITHIC build option.
[wxWidgets.git]
/
src
/
os2
/
dc.cpp
diff --git
a/src/os2/dc.cpp
b/src/os2/dc.cpp
index 9252f9cde97994188c5e3502474bfee04fa09105..b001e855687d50fd123c83ac308152da0184ca57 100644
(file)
--- a/
src/os2/dc.cpp
+++ b/
src/os2/dc.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dc.cpp
+// Name:
src/os2/
dc.cpp
// Purpose: wxDC class
// Author: David Webster
// Modified by:
// Purpose: wxDC class
// Author: David Webster
// Modified by:
@@
-221,7
+221,7
@@
wxDCCacheEntry* wxDC::FindBitmapInCache(
vBmpHdr.cx = nWidth;
vBmpHdr.cy = nHeight;
vBmpHdr.cPlanes = 1;
vBmpHdr.cx = nWidth;
vBmpHdr.cy = nHeight;
vBmpHdr.cPlanes = 1;
- vBmpHdr.cBitCount = nDepth;
+ vBmpHdr.cBitCount =
(USHORT)
nDepth;
pEntry->m_hBitmap = (WXHBITMAP) ::GpiCreateBitmap( hPS
,&vBmpHdr
pEntry->m_hBitmap = (WXHBITMAP) ::GpiCreateBitmap( hPS
,&vBmpHdr
@@
-244,7
+244,7
@@
wxDCCacheEntry* wxDC::FindBitmapInCache(
vBmpHdr.cx = nWidth;
vBmpHdr.cy = nHeight;
vBmpHdr.cPlanes = 1;
vBmpHdr.cx = nWidth;
vBmpHdr.cy = nHeight;
vBmpHdr.cPlanes = 1;
- vBmpHdr.cBitCount = nDepth;
+ vBmpHdr.cBitCount =
(USHORT)
nDepth;
WXHBITMAP hBitmap = (WXHBITMAP) ::GpiCreateBitmap( hPS
,&vBmpHdr
WXHBITMAP hBitmap = (WXHBITMAP) ::GpiCreateBitmap( hPS
,&vBmpHdr
@@
-1268,7
+1268,7
@@
void wxDC::DoDrawIcon(
//
// Need to copy back into a bitmap. ::WinDrawPointer uses device coords
// and I don't feel like figuring those out for scrollable windows so
//
// Need to copy back into a bitmap. ::WinDrawPointer uses device coords
// and I don't feel like figuring those out for scrollable windows so
- // just convert to a bitmap then let the DoDrawBitmap routin
g
display it
+ // just convert to a bitmap then let the DoDrawBitmap routin
e
display it
//
if (rIcon.IsXpm())
{
//
if (rIcon.IsXpm())
{
@@
-1291,10
+1291,12
@@
void wxDC::DoDrawBitmap(
, bool bUseMask
)
{
, bool bUseMask
)
{
+#if wxUSE_PRINTING_ARCHITECTURE
if (!IsKindOf(CLASSINFO(wxPrinterDC)))
if (!IsKindOf(CLASSINFO(wxPrinterDC)))
+#endif
{
HBITMAP hBitmap = (HBITMAP)rBmp.GetHBITMAP();
{
HBITMAP hBitmap = (HBITMAP)rBmp.GetHBITMAP();
- HBITMAP hBitmapOld = NULLHANDLE;
;
+ HBITMAP hBitmapOld = NULLHANDLE;
POINTL vPoint[4];
vY = OS2Y(vY,rBmp.GetHeight());
POINTL vPoint[4];
vY = OS2Y(vY,rBmp.GetHeight());
@@
-1387,7
+1389,7
@@
void wxDC::DoDrawBitmap(
lColor = m_textBackgroundColour.GetPixel();
//
lColor = m_textBackgroundColour.GetPixel();
//
- // Bitmap must be in
a double-word al
ligned address so we may
+ // Bitmap must be in
a double-word a
ligned address so we may
// have some padding to worry about
//
if (nLineBoundary > 0)
// have some padding to worry about
//
if (nLineBoundary > 0)
@@
-1871,9
+1873,7
@@
void wxDC::DoDrawRotatedText(
// set GDI objects
// ---------------------------------------------------------------------------
// set GDI objects
// ---------------------------------------------------------------------------
-void wxDC::DoSelectPalette(
- bool bRealize
-)
+void wxDC::DoSelectPalette( bool WXUNUSED(bRealize) )
{
//
// Set the old object temporarily, in case the assignment deletes an object
{
//
// Set the old object temporarily, in case the assignment deletes an object
@@
-2166,9
+2166,7
@@
void wxDC::SetRop(
::GpiSetMix((HPS)hDC, lCRop);
} // end of wxDC::SetRop
::GpiSetMix((HPS)hDC, lCRop);
} // end of wxDC::SetRop
-bool wxDC::StartDoc(
- const wxString& rsMessage
-)
+bool wxDC::StartDoc( const wxString& WXUNUSED(rsMessage) )
{
// We might be previewing, so return true to let it continue.
return true;
{
// We might be previewing, so return true to let it continue.
return true;
@@
-2363,10
+2361,8
@@
void wxDC::SetMapMode(
// ????
}; // end of wxDC::SetMapMode
// ????
}; // end of wxDC::SetMapMode
-void wxDC::SetUserScale(
- double dX
-, double dY
-)
+void wxDC::SetUserScale( double dX,
+ double dY )
{
m_userScaleX = dX;
m_userScaleY = dY;
{
m_userScaleX = dX;
m_userScaleY = dY;
@@
-2374,10
+2370,8
@@
void wxDC::SetUserScale(
SetMapMode(m_mappingMode);
} // end of wxDC::SetUserScale
SetMapMode(m_mappingMode);
} // end of wxDC::SetUserScale
-void wxDC::SetAxisOrientation(
- bool bXLeftRight
-, bool bYBottomUp
-)
+void wxDC::SetAxisOrientation( bool bXLeftRight,
+ bool bYBottomUp )
{
m_signX = bXLeftRight ? 1 : -1;
m_signY = bYBottomUp ? -1 : 1;
{
m_signX = bXLeftRight ? 1 : -1;
m_signY = bYBottomUp ? -1 : 1;
@@
-2488,19
+2482,17
@@
wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
// bit blit
// ---------------------------------------------------------------------------
// bit blit
// ---------------------------------------------------------------------------
-bool wxDC::DoBlit(
- wxCoord vXdest
-, wxCoord vYdest
-, wxCoord vWidth
-, wxCoord vHeight
-, wxDC* pSource
-, wxCoord vXsrc
-, wxCoord vYsrc
-, int nRop
-, bool bUseMask
-, wxCoord vXsrcMask
-, wxCoord vYsrcMask
-)
+bool wxDC::DoBlit( wxCoord vXdest,
+ wxCoord vYdest,
+ wxCoord vWidth,
+ wxCoord vHeight,
+ wxDC* pSource,
+ wxCoord vXsrc,
+ wxCoord vYsrc,
+ int nRop,
+ bool bUseMask,
+ wxCoord WXUNUSED(vXsrcMask),
+ wxCoord WXUNUSED(vYsrcMask) )
{
wxMask* pMask = NULL;
CHARBUNDLE vCbnd;
{
wxMask* pMask = NULL;
CHARBUNDLE vCbnd;
@@
-2594,7
+2586,6
@@
bool wxDC::DoBlit(
vBmpHdr.cBitCount = 24;
#if wxUSE_DC_CACHEING
vBmpHdr.cBitCount = 24;
#if wxUSE_DC_CACHEING
- if (true)
{
//
// create a temp buffer bitmap and DCs to access it and the mask
{
//
// create a temp buffer bitmap and DCs to access it and the mask
@@
-2613,9
+2604,9
@@
bool wxDC::DoBlit(
hPSMask = pDCCacheEntry1->m_hPS;
hDCBuffer = (HDC)pDCCacheEntry2->m_hPS;
hBufBitmap = (HBITMAP)pBitmapCacheEntry->m_hBitmap;
hPSMask = pDCCacheEntry1->m_hPS;
hDCBuffer = (HDC)pDCCacheEntry2->m_hPS;
hBufBitmap = (HBITMAP)pBitmapCacheEntry->m_hBitmap;
+ wxUnusedVar(hDCMask);
}
}
- else
-#endif
+#else
{
hDCMask = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE);
hDCBuffer = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE);
{
hDCMask = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE);
hDCBuffer = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDOP, NULLHANDLE);
@@
-2623,6
+2614,7
@@
bool wxDC::DoBlit(
hPSBuffer = ::GpiCreatePS(vHabmain, hDCBuffer, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);
hBufBitmap = ::GpiCreateBitmap(GetHPS(), &vBmpHdr, 0L, NULL, NULL);
}
hPSBuffer = ::GpiCreatePS(vHabmain, hDCBuffer, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);
hBufBitmap = ::GpiCreateBitmap(GetHPS(), &vBmpHdr, 0L, NULL, NULL);
}
+#endif
POINTL aPoint1[4] = { {0, 0}
,{vWidth, vHeight}
POINTL aPoint1[4] = { {0, 0}
,{vWidth, vHeight}
@@
-2800,10
+2792,8
@@
void wxDC::DoGetSize(
}
}; // end of wxDC::DoGetSize(
}
}; // end of wxDC::DoGetSize(
-void wxDC::DoGetSizeMM(
- int* pnWidth
-, int* pnHeight
-) const
+void wxDC::DoGetSizeMM( int* pnWidth,
+ int* pnHeight ) const
{
LONG lArray[CAPS_VERTICAL_RESOLUTION];
{
LONG lArray[CAPS_VERTICAL_RESOLUTION];
@@
-2813,17
+2803,19
@@
void wxDC::DoGetSizeMM(
,lArray
))
{
,lArray
))
{
- int nWidth;
- int nHeight;
- int nHorzRes;
- int nVertRes;
+ if(pnWidth)
+ {
+ int nWidth = lArray[CAPS_WIDTH];
+ int nHorzRes = lArray[CAPS_HORIZONTAL_RESOLUTION]; // returns pel/meter
+ *pnWidth = (nHorzRes/1000) * nWidth;
+ }
- nWidth = lArray[CAPS_WIDTH];
- nHeight = lArray[CAPS_HEIGHT];
- nHorzRes = lArray[CAPS_HORIZONTAL_RESOLUTION]; // returns pel/meter
-
nVertRes
= lArray[CAPS_VERTICAL_RESOLUTION]; // returns pel/meter
-
nWidth = (nHorzRes/1000) * nWidth
;
- nHeight = (nVertRes/1000) * nHeight;
+ if(pnHeight)
+ {
+ int nHeight = lArray[CAPS_HEIGHT];
+
int nVertRes
= lArray[CAPS_VERTICAL_RESOLUTION]; // returns pel/meter
+
*pnHeight = (nVertRes/1000) * nHeight
;
+ }
}
}; // end of wxDC::DoGetSizeMM
}
}; // end of wxDC::DoGetSizeMM
@@
-2851,7
+2843,8
@@
wxSize wxDC::GetPPI() const
nWidth = (int)((nHorzRes/39.3) * nPelWidth);
nHeight = (int)((nVertRes/39.3) * nPelHeight);
}
nWidth = (int)((nHorzRes/39.3) * nPelWidth);
nHeight = (int)((nVertRes/39.3) * nPelHeight);
}
- return (wxSize(nWidth,nHeight));
+ wxSize ppisize(nWidth, nHeight);
+ return ppisize;
} // end of wxDC::GetPPI
void wxDC::SetLogicalScale(
} // end of wxDC::GetPPI
void wxDC::SetLogicalScale(
@@
-2862,6
+2855,3
@@
void wxDC::SetLogicalScale(
m_logicalScaleX = dX;
m_logicalScaleY = dY;
}; // end of wxDC::SetLogicalScale
m_logicalScaleX = dX;
m_logicalScaleY = dY;
}; // end of wxDC::SetLogicalScale
-
-
-
projects / wxWidgets.git / blobdiff