From 5e9f40263d3f6d0aa56d8655500c346f87817646 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 28 Nov 1998 22:36:11 +0000 Subject: [PATCH] compilation fixes for !wxUSE_POSTSCRIPT git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/generic/prntdlgg.h | 6 +++++- src/common/postscrp.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h index 1ae7148ded..0ac2878eeb 100644 --- a/include/wx/generic/prntdlgg.h +++ b/include/wx/generic/prntdlgg.h @@ -29,6 +29,7 @@ class WXDLLEXPORT wxCheckBox; class WXDLLEXPORT wxChoice; class WXDLLEXPORT wxStaticText; class WXDLLEXPORT wxRadioBox; +class WXDLLEXPORT wxPrintSetupData; /* * Simulated Print and Print Setup dialogs @@ -94,7 +95,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 +107,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 diff --git a/src/common/postscrp.cpp b/src/common/postscrp.cpp index 2b0148e877..1ce7e6b6f5 100644 --- a/src/common/postscrp.cpp +++ b/src/common/postscrp.cpp @@ -29,7 +29,6 @@ #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/frame.h" -#include "wx/postscrp.h" #include "wx/utils.h" #include "wx/filedlg.h" #include "wx/msgdlg.h" @@ -42,6 +41,7 @@ #include "wx/list.h" #endif +#include "wx/postscrp.h" #include "wx/dcmemory.h" #ifdef __WXMSW__ -- 2.47.2