X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49b3c4dfca81bf36134ab2c22b1d6c265f5ba150..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/osx/printdlg.h?ds=sidebyside diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h index d6ec1ce09b..98de9f4e13 100644 --- a/include/wx/osx/printdlg.h +++ b/include/wx/osx/printdlg.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/printdlg.h +// Name: wx/osx/printdlg.h // Purpose: wxPrintDialog, wxPageSetupDialog classes. // Use generic, PostScript version if no // platform-specific implementation. @@ -18,7 +18,7 @@ #include "wx/cmndata.h" #include "wx/printdlg.h" #include "wx/prntbase.h" - + /* * wxMacPrintDialog * The Mac dialog for printing @@ -45,7 +45,7 @@ private: wxDC* m_printerDC; bool m_destroyDC; wxWindow* m_dialogParent; - + private: DECLARE_DYNAMIC_CLASS(wxPrintDialog) }; @@ -58,18 +58,18 @@ private: class WXDLLIMPEXP_CORE wxMacPageSetupDialog: public wxPageSetupDialogBase { public: - wxMacPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL); + wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); virtual ~wxMacPageSetupDialog(); - virtual wxPageSetupData& GetPageSetupDialogData(); - - bool Create(wxWindow *parent, wxPageSetupData *data = NULL); + virtual wxPageSetupDialogData& GetPageSetupDialogData(); + + bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); virtual int ShowModal(); - + private: - wxPageSetupData m_pageSetupData; + wxPageSetupDialogData m_pageSetupData; wxWindow* m_dialogParent; - + private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog) }; @@ -85,25 +85,25 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl; class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog { public: - wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupData* data); + wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data); bool TransferToWindow(); bool TransferDataFromWindow(); - virtual wxPageSetupData& GetPageSetupDialogData() { return *m_pageSetupDialogData; } + virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; } private: - wxPageSetupData* m_pageSetupDialogData; - + wxPageSetupDialogData* m_pageSetupDialogData; + wxPoint m_MinMarginTopLeft; wxPoint m_MinMarginBottomRight; wxTextCtrl *m_LeftMargin; wxTextCtrl *m_TopMargin; wxTextCtrl *m_RightMargin; wxTextCtrl *m_BottomMargin; - + void GetMinMargins(); bool CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name); - + private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog) };