X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c84e0c259bd9f4b74fa9c1c67b0d5aac3683bb6..68a9527d5185cdd9d3fef3d9421415c50de8794d:/include/wx/generic/prntdlgg.h?ds=inline diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h index 74f2a86790..41b4da8dd5 100644 --- a/include/wx/generic/prntdlgg.h +++ b/include/wx/generic/prntdlgg.h @@ -6,17 +6,13 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __PRINTDLGH_G_ #define __PRINTDLGH_G_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "prntdlgg.h" -#endif - #include "wx/defs.h" #if wxUSE_PRINTING_ARCHITECTURE @@ -43,7 +39,8 @@ class WXDLLEXPORT wxPageSetupData; // constants // ---------------------------------------------------------------------------- -// FIXME why all these enums start with 10 or 30? +// This is not clear why all these enums start with 10 or 30 but do not change it +// without good reason to avoid some subtle backwards compatibility breakage enum { @@ -85,12 +82,13 @@ class WXDLLEXPORT wxPostScriptPrintNativeData: public wxPrintNativeDataBase public: wxPostScriptPrintNativeData(); virtual ~wxPostScriptPrintNativeData(); - + virtual bool TransferTo( wxPrintData &data ); virtual bool TransferFrom( const wxPrintData &data ); - - virtual bool Ok() const { return true; } - + + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return true; } + const wxString& GetPrinterCommand() const { return m_printerCommand; } const wxString& GetPrinterOptions() const { return m_printerOptions; } const wxString& GetPreviewCommand() const { return m_previewCommand; } @@ -128,11 +126,11 @@ private: #if wxUSE_STREAMS wxOutputStream *m_outputStream; #endif - + private: DECLARE_DYNAMIC_CLASS(wxPostScriptPrintNativeData) }; - + // ---------------------------------------------------------------------------- // Simulated Print and Print Setup dialogs for non-Windows platforms (and // Windows using PostScript print/preview) @@ -194,7 +192,7 @@ public: void Init(wxPrintData* data); void OnPrinter(wxListEvent& event); - + virtual bool TransferDataFromWindow(); virtual bool TransferDataToWindow(); @@ -210,7 +208,7 @@ public: wxPrintData m_printData; wxPrintData& GetPrintData() { return m_printData; } - + // After pressing OK, write data here. wxPrintData* m_targetData; @@ -221,20 +219,20 @@ private: #endif // wxUSE_POSTSCRIPT -class WXDLLEXPORT wxGenericPageSetupDialog : public wxDialog +class WXDLLEXPORT wxGenericPageSetupDialog : public wxPageSetupDialogBase { public: wxGenericPageSetupDialog(wxWindow *parent = NULL, - wxPageSetupData* data = NULL); + wxPageSetupDialogData* data = NULL); virtual ~wxGenericPageSetupDialog(); virtual bool TransferDataFromWindow(); virtual bool TransferDataToWindow(); - void OnPrinter(wxCommandEvent& event); + virtual wxPageSetupDialogData& GetPageSetupDialogData(); + void OnPrinter(wxCommandEvent& event); wxComboBox *CreatePaperTypeChoice(int* x, int* y); - wxPageSetupData& GetPageSetupData() { return m_pageData; } public: wxButton* m_printerButton; @@ -245,9 +243,7 @@ public: wxTextCtrl* m_marginBottomText; wxComboBox* m_paperTypeChoice; - static bool m_pageSetupDialogCancelled; - - wxPageSetupData m_pageData; + wxPageSetupDialogData m_pageData; private: DECLARE_EVENT_TABLE() @@ -257,4 +253,4 @@ private: #endif #endif -// __PRINTDLGH_G__ +// __PRINTDLGH_G_