X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25889d3c43f537fea00a2b7d6df7bd7e63e113f8..9fce8d2eeea6879644acec98e1244516eb053b78:/include/wx/generic/prntdlgg.h diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h index 258d2afe20..097ea5403f 100644 --- a/include/wx/generic/prntdlgg.h +++ b/include/wx/generic/prntdlgg.h @@ -18,6 +18,9 @@ #endif #include "wx/defs.h" + +#if wxUSE_PRINTING_ARCHITECTURE + #include "wx/dialog.h" #include "wx/dialog.h" @@ -28,7 +31,7 @@ class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxButton; class WXDLLEXPORT wxCheckBox; -class WXDLLEXPORT wxChoice; +class WXDLLEXPORT wxComboBox; class WXDLLEXPORT wxStaticText; class WXDLLEXPORT wxRadioBox; class WXDLLEXPORT wxPrintSetupData; @@ -137,14 +140,14 @@ public: 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; - wxChoice* m_paperTypeChoice; + wxComboBox* m_paperTypeChoice; #if wxUSE_POSTSCRIPT wxPrintData m_printData; @@ -167,7 +170,7 @@ public: void OnPrinter(wxCommandEvent& event); - wxChoice *CreatePaperTypeChoice(int* x, int* y); + wxComboBox *CreatePaperTypeChoice(int* x, int* y); wxPageSetupData& GetPageSetupData() { return m_pageData; } public: @@ -177,7 +180,7 @@ public: wxTextCtrl* m_marginTopText; wxTextCtrl* m_marginRightText; wxTextCtrl* m_marginBottomText; - wxChoice* m_paperTypeChoice; + wxComboBox* m_paperTypeChoice; static bool m_pageSetupDialogCancelled; @@ -187,5 +190,7 @@ private: DECLARE_EVENT_TABLE() }; +#endif + #endif // __PRINTDLGH_G__