projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use wmain() if supported by the compiler/CRT instead of main().
[wxWidgets.git]
/
include
/
wx
/
msw
/
printwin.h
diff --git
a/include/wx/msw/printwin.h
b/include/wx/msw/printwin.h
index 7d7e466ed93a75bfb4f228f060a673f58b48a53e..14951384b37d6fc1d425cd67ee46afebc0a02a06 100644
(file)
--- a/
include/wx/msw/printwin.h
+++ b/
include/wx/msw/printwin.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: printwin.h
+// Name:
wx/msw/
printwin.h
// Purpose: wxWindowsPrinter, wxWindowsPrintPreview classes
// Author: Julian Smart
// Modified by:
// Purpose: wxWindowsPrinter, wxWindowsPrintPreview classes
// Author: Julian Smart
// Modified by:
@@
-24,7
+24,6
@@
class WXDLLIMPEXP_CORE wxWindowsPrinter : public wxPrinterBase
public:
wxWindowsPrinter(wxPrintDialogData *data = NULL);
public:
wxWindowsPrinter(wxPrintDialogData *data = NULL);
- virtual ~wxWindowsPrinter();
virtual bool Print(wxWindow *parent,
wxPrintout *printout,
virtual bool Print(wxWindow *parent,
wxPrintout *printout,
@@
-34,9
+33,7
@@
public:
virtual bool Setup(wxWindow *parent);
private:
virtual bool Setup(wxWindow *parent);
private:
- WXFARPROC m_lpAbortProc;
-
- DECLARE_NO_COPY_CLASS(wxWindowsPrinter)
+ wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);
};
// ---------------------------------------------------------------------------
};
// ---------------------------------------------------------------------------
@@
-44,8
+41,6
@@
private:
// wxPrintout.
// ---------------------------------------------------------------------------
// wxPrintout.
// ---------------------------------------------------------------------------
-#define wxUSE_HIGH_QUALITY_PREVIEW (wxUSE_IMAGE && wxUSE_WXDIB)
-
class WXDLLIMPEXP_CORE wxWindowsPrintPreview : public wxPrintPreviewBase
{
public:
class WXDLLIMPEXP_CORE wxWindowsPrintPreview : public wxPrintPreviewBase
{
public:
@@
-60,21
+55,10
@@
public:
virtual bool Print(bool interactive);
virtual void DetermineScaling();
virtual bool Print(bool interactive);
virtual void DetermineScaling();
-#if wxUSE_HIGH_QUALITY_PREVIEW
protected:
protected:
- bool RenderPageIntoBitmapHQ(wxBitmap& bmp, int pageNum);
+#if wxUSE_ENH_METAFILE
virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
-
-private:
- bool RenderPageFragment(float scaleX, float scaleY,
- int *nextFinalLine,
- wxPrinterDC& printer,
- wxMemoryDC& finalDC,
- const wxRect& rect,
- int pageNum);
-
- bool m_hqPreviewFailed;
-#endif // wxUSE_HIGH_QUALITY_PREVIEW
+#endif
DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)
};
DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)
};