projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow a - at the beginning of a menu item (would become a separator by default)
[wxWidgets.git]
/
src
/
os2
/
dcprint.cpp
diff --git
a/src/os2/dcprint.cpp
b/src/os2/dcprint.cpp
index 6aa9942d05d70398b509289d301b6f00e7a3de4c..7497cdee968d3d6d9eacd71d0ee4212254e09daa 100644
(file)
--- a/
src/os2/dcprint.cpp
+++ b/
src/os2/dcprint.cpp
@@
-42,7
+42,6
@@
wxPrinterDC::wxPrinterDC(
, int nOrientation
)
{
, int nOrientation
)
{
- LONG lType = 0;
DEVOPENSTRUC vDevOpen = { (char*)rsDeviceName.c_str()
,(char*)rsDriverName.c_str()
,NULL
DEVOPENSTRUC vDevOpen = { (char*)rsDeviceName.c_str()
,(char*)rsDriverName.c_str()
,NULL
@@
-233,7
+232,7
@@
void wxPrinterDC::EndPage()
// if (m_hDC)
// ::EndPage((HDC) m_hDC);
} // end of wxPrinterDC::EndPage
// if (m_hDC)
// ::EndPage((HDC) m_hDC);
} // end of wxPrinterDC::EndPage
-
+#if 0
// Returns default device and port names
static bool wxGetDefaultDeviceName(
wxString& rsDeviceName
// Returns default device and port names
static bool wxGetDefaultDeviceName(
wxString& rsDeviceName
@@
-295,6
+294,7
@@
static bool wxGetDefaultDeviceName(
*/
return(TRUE);
} // end of wxGetDefaultDeviceName
*/
return(TRUE);
} // end of wxGetDefaultDeviceName
+#endif
// Gets an HDC for the specified printer configuration
WXHDC WXDLLEXPORT wxGetPrinterDC(
// Gets an HDC for the specified printer configuration
WXHDC WXDLLEXPORT wxGetPrinterDC(
@@
-356,8
+356,8
@@
void wxPrinterDC::DoDrawBitmap(
{
wxCHECK_RET( rBmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") );
{
wxCHECK_RET( rBmp.Ok(), _T("invalid bitmap in wxPrinterDC::DrawBitmap") );
- int nWidth = rBmp.GetWidth();
- int nHeight = rBmp.GetHeight();
+
//
int nWidth = rBmp.GetWidth();
+
//
int nHeight = rBmp.GetHeight();
// TODO:
// TODO:
@@
-373,6
+373,8
@@
bool wxPrinterDC::DoBlit(
, wxCoord vYsrc
, int nRop
, bool bUseMask
, wxCoord vYsrc
, int nRop
, bool bUseMask
+, wxCoord xsrcMask
+, wxCoord ysrcMask
)
{
bool bSuccess = TRUE;
)
{
bool bSuccess = TRUE;