X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dbd6262a9ee7d735fb3930707346298f71b2cb7..a05da1b6827f40c0beb97225e9861356343e196b:/include/wx/mac/printdlg.h diff --git a/include/wx/mac/printdlg.h b/include/wx/mac/printdlg.h index ac31a49096..1c6eb915cb 100644 --- a/include/wx/mac/printdlg.h +++ b/include/wx/mac/printdlg.h @@ -33,18 +33,21 @@ class WXDLLEXPORT wxPrintDialog: public wxDialog public: wxPrintDialog(); - wxPrintDialog(wxWindow *parent, wxPrintData* data = NULL); + wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL); + wxPrintDialog(wxWindow *parent, wxPrintData* data ); ~wxPrintDialog(); - bool Create(wxWindow *parent, wxPrintData* data = NULL); + bool Create(wxWindow *parent, wxPrintDialogData* data = NULL); virtual int ShowModal(); - inline wxPrintData& GetPrintData() { return m_printData; } + wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; } + wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); } virtual wxDC *GetPrintDC(); private: - wxPrintData m_printData; + wxPrintDialogData m_printDialogData; wxDC* m_printerDC; + bool m_destroyDC; wxWindow* m_dialogParent; }; @@ -52,9 +55,6 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog { DECLARE_DYNAMIC_CLASS(wxPageSetupDialog) - private: - wxPageSetupData m_pageSetupData; - wxWindow* m_dialogParent; public: wxPageSetupDialog(); wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL); @@ -64,6 +64,9 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog virtual int ShowModal(); inline wxPageSetupData& GetPageSetupData() { return m_pageSetupData; } + private: + wxPageSetupData m_pageSetupData; + wxWindow* m_dialogParent; }; #endif