projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eliminate the hysteresis when scrollbars didn't disappear when the window was resized...
[wxWidgets.git]
/
include
/
wx
/
prntbase.h
diff --git
a/include/wx/prntbase.h
b/include/wx/prntbase.h
index 7e74c3b23552b5f8c7f0cfbceb19c532e5c8a4cf..a613f6cdef664630b4bd1a38e12565fb604b0c43 100644
(file)
--- a/
include/wx/prntbase.h
+++ b/
include/wx/prntbase.h
@@
-22,6
+22,7
@@
#include "wx/scrolwin.h"
#include "wx/dialog.h"
#include "wx/frame.h"
#include "wx/scrolwin.h"
#include "wx/dialog.h"
#include "wx/frame.h"
+#include "wx/dc.h"
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxDC;
class WXDLLIMPEXP_FWD_CORE wxButton;
@@
-54,7
+55,7
@@
enum wxPrinterError
// wxPrintFactory
//----------------------------------------------------------------------------
// wxPrintFactory
//----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPrintFactory
+class WXDLL
IMPEXP_CORE
wxPrintFactory
{
public:
wxPrintFactory() {}
{
public:
wxPrintFactory() {}
@@
-77,7
+78,7
@@
public:
virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
wxPageSetupDialogData * data = NULL ) = 0;
virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
wxPageSetupDialogData * data = NULL ) = 0;
- virtual wxDC
* CreatePrinterDC(
const wxPrintData& data ) = 0;
+ virtual wxDC
Impl* CreatePrinterDCImpl( wxPrinterDC *owner,
const wxPrintData& data ) = 0;
// What to do and what to show in the wxPrintDialog
// a) Use the generic print setup dialog or a native one?
// What to do and what to show in the wxPrintDialog
// a) Use the generic print setup dialog or a native one?
@@
-101,7
+102,7
@@
private:
static wxPrintFactory *m_factory;
};
static wxPrintFactory *m_factory;
};
-class WXDLL
EXPORT
wxNativePrintFactory: public wxPrintFactory
+class WXDLL
IMPEXP_CORE
wxNativePrintFactory: public wxPrintFactory
{
public:
virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );
{
public:
virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );
@@
-121,7
+122,7
@@
public:
virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
wxPageSetupDialogData * data = NULL );
virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent,
wxPageSetupDialogData * data = NULL );
- virtual wxDC
* CreatePrinterDC(
const wxPrintData& data );
+ virtual wxDC
Impl* CreatePrinterDCImpl( wxPrinterDC *owner,
const wxPrintData& data );
virtual bool HasPrintSetupDialog();
virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
virtual bool HasPrintSetupDialog();
virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
@@
-138,7
+139,7
@@
public:
// wxPrintNativeDataBase
//----------------------------------------------------------------------------
// wxPrintNativeDataBase
//----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPrintNativeDataBase: public wxObject
+class WXDLL
IMPEXP_CORE
wxPrintNativeDataBase: public wxObject
{
public:
wxPrintNativeDataBase();
{
public:
wxPrintNativeDataBase();
@@
-165,7
+166,7
@@
private:
* Represents the printer: manages printing a wxPrintout object
*/
* Represents the printer: manages printing a wxPrintout object
*/
-class WXDLL
EXPORT
wxPrinterBase: public wxObject
+class WXDLL
IMPEXP_CORE
wxPrinterBase: public wxObject
{
public:
wxPrinterBase(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
{
public:
wxPrinterBase(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
@@
-205,7
+206,7
@@
private:
// wxPrinter
//----------------------------------------------------------------------------
// wxPrinter
//----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPrinter: public wxPrinterBase
+class WXDLL
IMPEXP_CORE
wxPrinter: public wxPrinterBase
{
public:
wxPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
{
public:
wxPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
@@
-239,7
+240,7
@@
private:
* object for previewing.
*/
* object for previewing.
*/
-class WXDLL
EXPORT
wxPrintout: public wxObject
+class WXDLL
IMPEXP_CORE
wxPrintout: public wxObject
{
public:
wxPrintout(const wxString& title = wxT("Printout"));
{
public:
wxPrintout(const wxString& title = wxT("Printout"));
@@
-283,8
+284,10
@@
public:
void GetPageSizeMM(int *w, int *h) const { *w = m_pageWidthMM; *h = m_pageHeightMM; }
void SetPPIScreen(int x, int y) { m_PPIScreenX = x; m_PPIScreenY = y; }
void GetPageSizeMM(int *w, int *h) const { *w = m_pageWidthMM; *h = m_pageHeightMM; }
void SetPPIScreen(int x, int y) { m_PPIScreenX = x; m_PPIScreenY = y; }
+ void SetPPIScreen(const wxSize& ppi) { SetPPIScreen(ppi.x, ppi.y); }
void GetPPIScreen(int *x, int *y) const { *x = m_PPIScreenX; *y = m_PPIScreenY; }
void SetPPIPrinter(int x, int y) { m_PPIPrinterX = x; m_PPIPrinterY = y; }
void GetPPIScreen(int *x, int *y) const { *x = m_PPIScreenX; *y = m_PPIScreenY; }
void SetPPIPrinter(int x, int y) { m_PPIPrinterX = x; m_PPIPrinterY = y; }
+ void SetPPIPrinter(const wxSize& ppi) { SetPPIPrinter(ppi.x, ppi.y); }
void GetPPIPrinter(int *x, int *y) const { *x = m_PPIPrinterX; *y = m_PPIPrinterY; }
void SetPaperRectPixels(const wxRect& paperRectPixels) { m_paperRectPixels = paperRectPixels; }
void GetPPIPrinter(int *x, int *y) const { *x = m_PPIPrinterX; *y = m_PPIPrinterY; }
void SetPaperRectPixels(const wxRect& paperRectPixels) { m_paperRectPixels = paperRectPixels; }
@@
-326,7
+329,7
@@
private:
* Canvas upon which a preview is drawn.
*/
* Canvas upon which a preview is drawn.
*/
-class WXDLL
EXPORT
wxPreviewCanvas: public wxScrolledWindow
+class WXDLL
IMPEXP_CORE
wxPreviewCanvas: public wxScrolledWindow
{
public:
wxPreviewCanvas(wxPrintPreviewBase *preview,
{
public:
wxPreviewCanvas(wxPrintPreviewBase *preview,
@@
-337,6
+340,8
@@
public:
const wxString& name = wxT("canvas"));
virtual ~wxPreviewCanvas();
const wxString& name = wxT("canvas"));
virtual ~wxPreviewCanvas();
+ void SetPreview(wxPrintPreviewBase *preview) { m_printPreview = preview; }
+
void OnPaint(wxPaintEvent& event);
void OnChar(wxKeyEvent &event);
// Responds to colour changes
void OnPaint(wxPaintEvent& event);
void OnChar(wxKeyEvent &event);
// Responds to colour changes
@@
-346,6
+351,7
@@
private:
#if wxUSE_MOUSEWHEEL
void OnMouseWheel(wxMouseEvent& event);
#endif // wxUSE_MOUSEWHEEL
#if wxUSE_MOUSEWHEEL
void OnMouseWheel(wxMouseEvent& event);
#endif // wxUSE_MOUSEWHEEL
+ void OnIdle(wxIdleEvent& event);
wxPrintPreviewBase* m_printPreview;
wxPrintPreviewBase* m_printPreview;
@@
-362,7
+368,7
@@
private:
* Default frame for showing preview.
*/
* Default frame for showing preview.
*/
-class WXDLL
EXPORT
wxPreviewFrame: public wxFrame
+class WXDLL
IMPEXP_CORE
wxPreviewFrame: public wxFrame
{
public:
wxPreviewFrame(wxPrintPreviewBase *preview,
{
public:
wxPreviewFrame(wxPrintPreviewBase *preview,
@@
-426,7
+432,7
@@
private:
#define wxID_PREVIEW_LAST 7
#define wxID_PREVIEW_GOTO 8
#define wxID_PREVIEW_LAST 7
#define wxID_PREVIEW_GOTO 8
-class WXDLL
EXPORT
wxPreviewControlBar: public wxPanel
+class WXDLL
IMPEXP_CORE
wxPreviewControlBar: public wxPanel
{
DECLARE_CLASS(wxPreviewControlBar)
{
DECLARE_CLASS(wxPreviewControlBar)
@@
-487,7
+493,7
@@
private:
* Programmer creates an object of this class to preview a wxPrintout.
*/
* Programmer creates an object of this class to preview a wxPrintout.
*/
-class WXDLL
EXPORT
wxPrintPreviewBase: public wxObject
+class WXDLL
IMPEXP_CORE
wxPrintPreviewBase: public wxObject
{
public:
wxPrintPreviewBase(wxPrintout *printout,
{
public:
wxPrintPreviewBase(wxPrintout *printout,
@@
-518,6
+524,10
@@
public:
// The preview canvas should call this from OnPaint
virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);
// The preview canvas should call this from OnPaint
virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);
+ // Updates rendered page by calling RenderPage() if needed, returns true
+ // if there was some change. Preview canvas should call it at idle time
+ virtual bool UpdatePageRendering();
+
// This draws a blank page onto the preview canvas
virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
// This draws a blank page onto the preview canvas
virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
@@
-553,11
+563,20
@@
public:
// the currently selected printer.
virtual void DetermineScaling() = 0;
// the currently selected printer.
virtual void DetermineScaling() = 0;
+protected:
+ // helpers for RenderPage():
+ virtual bool RenderPageIntoDC(wxDC& dc, int pageNum);
+ // renders preview into m_previewBitmap
+ virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
+
+ void InvalidatePreviewBitmap();
+
protected:
wxPrintDialogData m_printDialogData;
wxPreviewCanvas* m_previewCanvas;
wxFrame* m_previewFrame;
wxBitmap* m_previewBitmap;
protected:
wxPrintDialogData m_printDialogData;
wxPreviewCanvas* m_previewCanvas;
wxFrame* m_previewFrame;
wxBitmap* m_previewBitmap;
+ bool m_previewFailed;
wxPrintout* m_previewPrintout;
wxPrintout* m_printPrintout;
int m_currentPage;
wxPrintout* m_previewPrintout;
wxPrintout* m_printPrintout;
int m_currentPage;
@@
-585,7
+604,7
@@
private:
// wxPrintPreview
//----------------------------------------------------------------------------
// wxPrintPreview
//----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPrintPreview: public wxPrintPreviewBase
+class WXDLL
IMPEXP_CORE
wxPrintPreview: public wxPrintPreviewBase
{
public:
wxPrintPreview(wxPrintout *printout,
{
public:
wxPrintPreview(wxPrintout *printout,
@@
-607,6
+626,7
@@
public:
virtual wxFrame *GetFrame() const;
virtual wxPreviewCanvas *GetCanvas() const;
virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);
virtual wxFrame *GetFrame() const;
virtual wxPreviewCanvas *GetCanvas() const;
virtual bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc);
+ virtual bool UpdatePageRendering();
virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
virtual void AdjustScrollbars(wxPreviewCanvas *canvas);
virtual bool RenderPage(int pageNum);
virtual bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc);
virtual void AdjustScrollbars(wxPreviewCanvas *canvas);
virtual bool RenderPage(int pageNum);
@@
-637,7
+657,7
@@
private:
// wxPrintAbortDialog
//----------------------------------------------------------------------------
// wxPrintAbortDialog
//----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPrintAbortDialog: public wxDialog
+class WXDLL
IMPEXP_CORE
wxPrintAbortDialog: public wxDialog
{
public:
wxPrintAbortDialog(wxWindow *parent,
{
public:
wxPrintAbortDialog(wxWindow *parent,