projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing wxUSE_OLE checks to safearray.cpp.
[wxWidgets.git]
/
include
/
wx
/
os2
/
dcprint.h
diff --git
a/include/wx/os2/dcprint.h
b/include/wx/os2/dcprint.h
index 0cf75b37b196e82e1e635ac208e72fc0e3dc2386..6418f99a312bc661b5c658f4c364c3462ec7fdda 100644
(file)
--- a/
include/wx/os2/dcprint.h
+++ b/
include/wx/os2/dcprint.h
@@
-16,28
+16,24
@@
#include "wx/dc.h"
#include "wx/cmndata.h"
#include "wx/dc.h"
#include "wx/cmndata.h"
+#include "wx/os2/dc.h"
-class WXDLL
EXPORT wxPrinterDC: public wxDC
+class WXDLL
IMPEXP_CORE wxPrinterDCImpl: public wxPMDCImpl
{
public:
{
public:
- // Create a printer DC [obsolete]
- wxPrinterDC( const wxString& rsDriver
- ,const wxString& rsDevice
- ,const wxString& rsOutput
- ,bool bInteractive = TRUE
- ,int nOrientation = wxPORTRAIT
- );
+ // Create a printer DC
// Create from print data
// Create from print data
- wxPrinterDC
(const wxPrintData& rData
);
- wxPrinterDC
(
WXHDC hTheDC);
+ wxPrinterDC
Impl( wxPrinterDC *owner, const wxPrintData& rData
);
+ wxPrinterDC
Impl( wxPrinterDC *owner,
WXHDC hTheDC);
- bool StartDoc(const wxString& rsMessage);
- void EndDoc(void);
- void StartPage(void);
- void EndPage(void);
+ // override some base class virtuals
+ virtual bool StartDoc(const wxString& rsMessage);
+ virtual void EndDoc(void);
+ virtual void StartPage(void);
+ virtual void EndPage(void);
-
wxRect GetPaperRect()
;
+
virtual wxRect GetPaperRect() const
;
protected:
virtual void DoDrawBitmap( const wxBitmap& rBmp
protected:
virtual void DoDrawBitmap( const wxBitmap& rBmp
@@
-52,7
+48,7
@@
protected:
,wxDC* pSource
,wxCoord vXsrc
,wxCoord vYsrc
,wxDC* pSource
,wxCoord vXsrc
,wxCoord vYsrc
- ,
int
nRop = wxCOPY
+ ,
wxRasterOperationMode
nRop = wxCOPY
,bool bUseMask = FALSE
,wxCoord vXsrcMask = -1
,wxCoord vYsrcMask = -1
,bool bUseMask = FALSE
,wxCoord vXsrcMask = -1
,wxCoord vYsrcMask = -1
@@
-63,11
+59,12
@@
protected:
wxPrintData m_printData;
private:
wxPrintData m_printData;
private:
- DECLARE_CLASS(wxPrinterDC)
+ DECLARE_CLASS(wxPrinterDCImpl)
+ wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);
}; // end of CLASS wxPrinterDC
// Gets an HDC for the specified printer configuration
}; // end of CLASS wxPrinterDC
// Gets an HDC for the specified printer configuration
-WXHDC WXDLL
EXPORT
wxGetPrinterDC(const wxPrintData& rData);
+WXHDC WXDLL
IMPEXP_CORE
wxGetPrinterDC(const wxPrintData& rData);
#endif // wxUSE_PRINTING_ARCHITECTURE
#endif // wxUSE_PRINTING_ARCHITECTURE