X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..721b32e05823b7b7356f9a7a99f7d0af457dc5f3:/include/wx/generic/prntdlgg.h diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h index c9cbee6d75..be7cf5c5e4 100644 --- a/include/wx/generic/prntdlgg.h +++ b/include/wx/generic/prntdlgg.h @@ -21,7 +21,11 @@ #include "wx/dialog.h" #include "wx/dc.h" #include "wx/cmndata.h" -#include "wx/postscrp.h" +#include "wx/dialog.h" + +#if wxUSE_POSTSCRIPT +#include "wx/dcps.h" +#endif class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxButton; @@ -29,6 +33,7 @@ class WXDLLEXPORT wxCheckBox; class WXDLLEXPORT wxChoice; class WXDLLEXPORT wxStaticText; class WXDLLEXPORT wxRadioBox; +class WXDLLEXPORT wxPrintSetupData; /* * Simulated Print and Print Setup dialogs @@ -94,7 +99,11 @@ class WXDLLEXPORT wxGenericPrintSetupDialog: public wxDialog wxCheckBox *colourCheckBox; wxChoice *paperTypeChoice; +#if wxUSE_POSTSCRIPT wxPrintSetupData printData; + inline wxPrintSetupData& GetPrintData(void) { return printData; } +#endif + wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSetupData* data); ~wxGenericPrintSetupDialog(void); @@ -102,7 +111,6 @@ class WXDLLEXPORT wxGenericPrintSetupDialog: public wxDialog virtual bool TransferDataToWindow(void); wxChoice *CreatePaperTypeChoice(int* x, int* y); - inline wxPrintSetupData& GetPrintData(void) { return printData; } }; #define wxPRINTID_LEFTMARGIN 30 @@ -127,7 +135,7 @@ class WXDLLEXPORT wxGenericPageSetupDialog: public wxDialog wxPageSetupData pageData; - wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data = NULL); + wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data = (wxPageSetupData*) NULL); ~wxGenericPageSetupDialog(void); virtual bool TransferDataFromWindow(void);