compilation fixes for !wxUSE_POSTSCRIPT

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 1ae7148ded27832bf29e6edcd15a5603a75773c4..0ac2878eeb11d66eba9c8f380bcaa974237d80e3 100644 (file)
--- 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 wxChoice;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxRadioBox;

+class WXDLLEXPORT wxPrintSetupData;

 
 /*
  * Simulated Print and Print Setup dialogs
 
 /*
  * Simulated Print and Print Setup dialogs


@@ -94,7 +95,11 @@ class WXDLLEXPORT wxGenericPrintSetupDialog: public wxDialog
   wxCheckBox *colourCheckBox;
   wxChoice   *paperTypeChoice;
 
   wxCheckBox *colourCheckBox;
   wxChoice   *paperTypeChoice;
 

+#if wxUSE_POSTSCRIPT

   wxPrintSetupData printData;
   wxPrintSetupData printData;

+  inline wxPrintSetupData& GetPrintData(void) { return printData; }
+#endif
+

   wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSetupData* data);
   ~wxGenericPrintSetupDialog(void);
 
   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);
   virtual bool TransferDataToWindow(void);
 
   wxChoice *CreatePaperTypeChoice(int* x, int* y);

-  inline wxPrintSetupData& GetPrintData(void) { return printData; }

 };
 
 #define wxPRINTID_LEFTMARGIN         30
 };
 
 #define wxPRINTID_LEFTMARGIN         30

diff --git a/src/common/postscrp.cpp b/src/common/postscrp.cpp
index 2b0148e877ccec395c7ac83d85d536e31cf76ad7..1ce7e6b6f569125b9f7796a794f524534adc726f 100644 (file)
--- 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"
 #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"
 #include "wx/utils.h"
 #include "wx/filedlg.h"
 #include "wx/msgdlg.h"


@@ -42,6 +41,7 @@
 #include "wx/list.h"
 #endif
 
 #include "wx/list.h"
 #endif
 

+#include "wx/postscrp.h"

 #include "wx/dcmemory.h"
 
 #ifdef __WXMSW__
 #include "wx/dcmemory.h"
 
 #ifdef __WXMSW__