SWIGged updates for wxGTK

[wxWidgets.git] / include / wx / generic / prntdlgg.h

diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h
index 9b86b32965e0ca1909b82d4a71ca1b82b95c68dc..99d4d2a97402a29383487a0bd6eaa76bbe3eec2c 100644 (file)
--- a/include/wx/generic/prntdlgg.h
+++ b/include/wx/generic/prntdlgg.h
@@ -18,7 +18,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/dialog.h"
+
+#if wxUSE_PRINTING_ARCHITECTURE
+

 #include "wx/dialog.h"
 
 #if wxUSE_POSTSCRIPT
 #include "wx/dialog.h"
 
 #if wxUSE_POSTSCRIPT


@@ -28,7 +30,7 @@
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxCheckBox;
 class WXDLLEXPORT wxTextCtrl;
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxCheckBox;

-class WXDLLEXPORT wxChoice;
+class WXDLLEXPORT wxComboBox;

 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxRadioBox;
 class WXDLLEXPORT wxPrintSetupData;
 class WXDLLEXPORT wxStaticText;
 class WXDLLEXPORT wxRadioBox;
 class WXDLLEXPORT wxPrintSetupData;


@@ -72,6 +74,7 @@ enum
 // Windows using PostScript print/preview)
 // ----------------------------------------------------------------------------
 
 // Windows using PostScript print/preview)
 // ----------------------------------------------------------------------------
 

+#if wxUSE_POSTSCRIPT

 class WXDLLEXPORT wxGenericPrintDialog : public wxDialog
 {
     DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)
 class WXDLLEXPORT wxGenericPrintDialog : public wxDialog
 {
     DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog)


@@ -101,15 +104,15 @@ public:
     wxDC *GetPrintDC();
 
 public:
     wxDC *GetPrintDC();
 
 public:

-    wxStaticText*       m_printerMessage;
+//    wxStaticText*       m_printerMessage;

     wxButton*           m_setupButton;
     wxButton*           m_setupButton;

-    wxButton*           m_helpButton;
+//    wxButton*           m_helpButton;

     wxRadioBox*         m_rangeRadioBox;
     wxTextCtrl*         m_fromText;
     wxTextCtrl*         m_toText;
     wxTextCtrl*         m_noCopiesText;
     wxCheckBox*         m_printToFileCheckBox;
     wxRadioBox*         m_rangeRadioBox;
     wxTextCtrl*         m_fromText;
     wxTextCtrl*         m_toText;
     wxTextCtrl*         m_noCopiesText;
     wxCheckBox*         m_printToFileCheckBox;

-    wxCheckBox*         m_collateCopiesCheckBox;
+//    wxCheckBox*         m_collateCopiesCheckBox;

 
     wxPrintDialogData   m_printDialogData;
 
 
     wxPrintDialogData   m_printDialogData;
 


@@ -136,20 +139,22 @@ public:
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 
     virtual bool TransferDataFromWindow();
     virtual bool TransferDataToWindow();
 

-    wxChoice *CreatePaperTypeChoice(int* x, int* y);
+    wxComboBox *CreatePaperTypeChoice(int* x, int* y);

 
 public:
     wxRadioBox*         m_orientationRadioBox;
     wxTextCtrl*         m_printerCommandText;
     wxTextCtrl*         m_printerOptionsText;
     wxCheckBox*         m_colourCheckBox;
 
 public:
     wxRadioBox*         m_orientationRadioBox;
     wxTextCtrl*         m_printerCommandText;
     wxTextCtrl*         m_printerOptionsText;
     wxCheckBox*         m_colourCheckBox;

-    wxChoice*           m_paperTypeChoice;
+    wxComboBox*           m_paperTypeChoice;

 
 #if wxUSE_POSTSCRIPT
     wxPrintData         m_printData;
     wxPrintData&        GetPrintData() { return m_printData; }
 #endif // wxUSE_POSTSCRIPT
 };
 
 #if wxUSE_POSTSCRIPT
     wxPrintData         m_printData;
     wxPrintData&        GetPrintData() { return m_printData; }
 #endif // wxUSE_POSTSCRIPT
 };

+#endif
+    // wxUSE_POSTSCRIPT

 
 class WXDLLEXPORT wxGenericPageSetupDialog : public wxDialog
 {
 
 class WXDLLEXPORT wxGenericPageSetupDialog : public wxDialog
 {


@@ -164,7 +169,7 @@ public:
 
     void OnPrinter(wxCommandEvent& event);
 
 
     void OnPrinter(wxCommandEvent& event);
 

-    wxChoice *CreatePaperTypeChoice(int* x, int* y);
+    wxComboBox *CreatePaperTypeChoice(int* x, int* y);

     wxPageSetupData& GetPageSetupData() { return m_pageData; }
 
 public:
     wxPageSetupData& GetPageSetupData() { return m_pageData; }
 
 public:


@@ -174,7 +179,7 @@ public:
     wxTextCtrl*     m_marginTopText;
     wxTextCtrl*     m_marginRightText;
     wxTextCtrl*     m_marginBottomText;
     wxTextCtrl*     m_marginTopText;
     wxTextCtrl*     m_marginRightText;
     wxTextCtrl*     m_marginBottomText;

-    wxChoice*       m_paperTypeChoice;
+    wxComboBox*       m_paperTypeChoice;

 
     static bool     m_pageSetupDialogCancelled;
 
 
     static bool     m_pageSetupDialogCancelled;
 


@@ -184,5 +189,7 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+#endif
+

 #endif
 // __PRINTDLGH_G__
 #endif
 // __PRINTDLGH_G__