projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
save the current status text for each pane inside wxStatusBarPane: native controls...
[wxWidgets.git]
/
include
/
wx
/
prntbase.h
diff --git
a/include/wx/prntbase.h
b/include/wx/prntbase.h
index 1dd863792724f6a37bf0f50de8e76977838beb30..0a6aecaa463496189fed5bae1c81e974baa4962d 100644
(file)
--- a/
include/wx/prntbase.h
+++ b/
include/wx/prntbase.h
@@
-55,7
+55,7
@@
enum wxPrinterError
// wxPrintFactory
//----------------------------------------------------------------------------
// wxPrintFactory
//----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPrintFactory
+class WXDLL
IMPEXP_CORE
wxPrintFactory
{
public:
wxPrintFactory() {}
{
public:
wxPrintFactory() {}
@@
-102,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 );
@@
-139,7
+139,7
@@
public:
// wxPrintNativeDataBase
//----------------------------------------------------------------------------
// wxPrintNativeDataBase
//----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPrintNativeDataBase: public wxObject
+class WXDLL
IMPEXP_CORE
wxPrintNativeDataBase: public wxObject
{
public:
wxPrintNativeDataBase();
{
public:
wxPrintNativeDataBase();
@@
-155,7
+155,7
@@
public:
private:
DECLARE_CLASS(wxPrintNativeDataBase)
private:
DECLARE_CLASS(wxPrintNativeDataBase)
- DECLARE_NO_COPY_CLASS(wxPrintNativeDataBase)
+ wxDECLARE_NO_COPY_CLASS(wxPrintNativeDataBase);
};
//----------------------------------------------------------------------------
};
//----------------------------------------------------------------------------
@@
-166,10
+166,10
@@
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:
{
public:
- wxPrinterBase(wxPrintDialogData *data =
(wxPrintDialogData *)
NULL);
+ wxPrinterBase(wxPrintDialogData *data = NULL);
virtual ~wxPrinterBase();
virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
virtual ~wxPrinterBase();
virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
@@
-199,17
+199,17
@@
public:
private:
DECLARE_CLASS(wxPrinterBase)
private:
DECLARE_CLASS(wxPrinterBase)
- DECLARE_NO_COPY_CLASS(wxPrinterBase)
+ wxDECLARE_NO_COPY_CLASS(wxPrinterBase);
};
//----------------------------------------------------------------------------
// wxPrinter
//----------------------------------------------------------------------------
};
//----------------------------------------------------------------------------
// wxPrinter
//----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPrinter: public wxPrinterBase
+class WXDLL
IMPEXP_CORE
wxPrinter: public wxPrinterBase
{
public:
{
public:
- wxPrinter(wxPrintDialogData *data =
(wxPrintDialogData *)
NULL);
+ wxPrinter(wxPrintDialogData *data = NULL);
virtual ~wxPrinter();
virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
virtual ~wxPrinter();
virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
@@
-226,7
+226,7
@@
protected:
private:
DECLARE_CLASS(wxPrinter)
private:
DECLARE_CLASS(wxPrinter)
- DECLARE_NO_COPY_CLASS(wxPrinter)
+ wxDECLARE_NO_COPY_CLASS(wxPrinter);
};
//----------------------------------------------------------------------------
};
//----------------------------------------------------------------------------
@@
-240,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"));
@@
-284,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; }
@@
-316,7
+318,7
@@
private:
private:
DECLARE_ABSTRACT_CLASS(wxPrintout)
private:
DECLARE_ABSTRACT_CLASS(wxPrintout)
- DECLARE_NO_COPY_CLASS(wxPrintout)
+ wxDECLARE_NO_COPY_CLASS(wxPrintout);
};
//----------------------------------------------------------------------------
};
//----------------------------------------------------------------------------
@@
-327,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,
@@
-338,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
@@
-347,12
+351,13
@@
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;
DECLARE_CLASS(wxPreviewCanvas)
DECLARE_EVENT_TABLE()
wxPrintPreviewBase* m_printPreview;
DECLARE_CLASS(wxPreviewCanvas)
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxPreviewCanvas)
+ wxDECLARE_NO_COPY_CLASS(wxPreviewCanvas);
};
//----------------------------------------------------------------------------
};
//----------------------------------------------------------------------------
@@
-363,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,
@@
-371,8
+376,8
@@
public:
const wxString& title = wxT("Print Preview"),
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxString& title = wxT("Print Preview"),
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- long style = wxDEFAULT_FRAME_STYLE,
- const wxString& name = wx
T("frame")
);
+ long style = wxDEFAULT_FRAME_STYLE
| wxFRAME_FLOAT_ON_PARENT
,
+ const wxString& name = wx
FrameNameStr
);
virtual ~wxPreviewFrame();
void OnCloseWindow(wxCloseEvent& event);
virtual ~wxPreviewFrame();
void OnCloseWindow(wxCloseEvent& event);
@@
-393,7
+398,7
@@
private:
DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxPreviewFrame)
DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxPreviewFrame)
- DECLARE_NO_COPY_CLASS(wxPreviewFrame)
+ wxDECLARE_NO_COPY_CLASS(wxPreviewFrame);
};
//----------------------------------------------------------------------------
};
//----------------------------------------------------------------------------
@@
-427,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)
@@
-477,7
+482,7
@@
protected:
private:
DECLARE_EVENT_TABLE()
private:
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxPreviewControlBar)
+ wxDECLARE_NO_COPY_CLASS(wxPreviewControlBar);
};
//----------------------------------------------------------------------------
};
//----------------------------------------------------------------------------
@@
-488,12
+493,12
@@
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,
- wxPrintout *printoutForPrinting =
(wxPrintout *)
NULL,
- wxPrintDialogData *data =
(wxPrintDialogData *)
NULL);
+ wxPrintout *printoutForPrinting = NULL,
+ wxPrintDialogData *data = NULL);
wxPrintPreviewBase(wxPrintout *printout,
wxPrintout *printoutForPrinting,
wxPrintData *data);
wxPrintPreviewBase(wxPrintout *printout,
wxPrintout *printoutForPrinting,
wxPrintData *data);
@@
-519,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);
@@
-554,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;
@@
-578,7
+596,7
@@
protected:
private:
void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
private:
void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
- DECLARE_NO_COPY_CLASS(wxPrintPreviewBase)
+ wxDECLARE_NO_COPY_CLASS(wxPrintPreviewBase);
DECLARE_CLASS(wxPrintPreviewBase)
};
DECLARE_CLASS(wxPrintPreviewBase)
};
@@
-586,12
+604,12
@@
private:
// wxPrintPreview
//----------------------------------------------------------------------------
// wxPrintPreview
//----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPrintPreview: public wxPrintPreviewBase
+class WXDLL
IMPEXP_CORE
wxPrintPreview: public wxPrintPreviewBase
{
public:
wxPrintPreview(wxPrintout *printout,
{
public:
wxPrintPreview(wxPrintout *printout,
- wxPrintout *printoutForPrinting =
(wxPrintout *)
NULL,
- wxPrintDialogData *data =
(wxPrintDialogData *)
NULL);
+ wxPrintout *printoutForPrinting = NULL,
+ wxPrintDialogData *data = NULL);
wxPrintPreview(wxPrintout *printout,
wxPrintout *printoutForPrinting,
wxPrintData *data);
wxPrintPreview(wxPrintout *printout,
wxPrintout *printoutForPrinting,
wxPrintData *data);
@@
-608,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);
@@
-631,14
+650,14
@@
private:
private:
DECLARE_CLASS(wxPrintPreview)
private:
DECLARE_CLASS(wxPrintPreview)
- DECLARE_NO_COPY_CLASS(wxPrintPreview)
+ wxDECLARE_NO_COPY_CLASS(wxPrintPreview);
};
//----------------------------------------------------------------------------
// wxPrintAbortDialog
//----------------------------------------------------------------------------
};
//----------------------------------------------------------------------------
// wxPrintAbortDialog
//----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxPrintAbortDialog: public wxDialog
+class WXDLL
IMPEXP_CORE
wxPrintAbortDialog: public wxDialog
{
public:
wxPrintAbortDialog(wxWindow *parent,
{
public:
wxPrintAbortDialog(wxWindow *parent,
@@
-655,7
+674,7
@@
public:
private:
DECLARE_EVENT_TABLE()
private:
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxPrintAbortDialog)
+ wxDECLARE_NO_COPY_CLASS(wxPrintAbortDialog);
};
#endif // wxUSE_PRINTING_ARCHITECTURE
};
#endif // wxUSE_PRINTING_ARCHITECTURE