From: Vadim Zeitlin Date: Mon, 20 Feb 2012 21:55:55 +0000 (+0000) Subject: Use wxPageSetupDialogData instead of old wxPageSetupData everywhere. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7193abfbc8e8e66555b38dad56dce5fcfaee3204?ds=sidebyside Use wxPageSetupDialogData instead of old wxPageSetupData everywhere. No real changes, just don't use the old and kept for compatibility only wxPageSetupData name. Closes #13992. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index ecd42d07f2..bde3665117 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -280,7 +280,7 @@ public: // Use paper id in wxPrintData to set this object's paper size void CalculatePaperSizeFromId(); - wxPageSetupDialogData& operator=(const wxPageSetupData& data); + wxPageSetupDialogData& operator=(const wxPageSetupDialogData& data); wxPageSetupDialogData& operator=(const wxPrintData& data); wxPrintData& GetPrintData() { return m_printData; } diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h index 726f177b1a..5271b3891e 100644 --- a/include/wx/generic/prntdlgg.h +++ b/include/wx/generic/prntdlgg.h @@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox; class WXDLLIMPEXP_FWD_CORE wxComboBox; class WXDLLIMPEXP_FWD_CORE wxStaticText; class WXDLLIMPEXP_FWD_CORE wxRadioBox; -class WXDLLIMPEXP_FWD_CORE wxPageSetupData; +class WXDLLIMPEXP_FWD_CORE wxPageSetupDialogData; // ---------------------------------------------------------------------------- // constants diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h index bcca2b91e9..9f2330f071 100644 --- a/include/wx/msw/printdlg.h +++ b/include/wx/msw/printdlg.h @@ -107,7 +107,7 @@ public: bool ConvertToNative( wxPageSetupDialogData &data ); bool ConvertFromNative( wxPageSetupDialogData &data ); - virtual wxPageSetupData& GetPageSetupDialogData() { return m_pageSetupData; } + virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; } private: wxPageSetupDialogData m_pageSetupData; diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h index 1b976619fa..98de9f4e13 100644 --- a/include/wx/osx/printdlg.h +++ b/include/wx/osx/printdlg.h @@ -58,16 +58,16 @@ 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(); + virtual wxPageSetupDialogData& GetPageSetupDialogData(); - bool Create(wxWindow *parent, wxPageSetupData *data = NULL); + bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); virtual int ShowModal(); private: - wxPageSetupData m_pageSetupData; + wxPageSetupDialogData m_pageSetupData; wxWindow* m_dialogParent; private: @@ -85,14 +85,14 @@ 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; diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h index 1ff6ef1533..cba26f9091 100644 --- a/include/wx/richtext/richtextprint.h +++ b/include/wx/richtext/richtextprint.h @@ -202,7 +202,7 @@ public: /// Set print and page setup data void SetPrintData(const wxPrintData& printData); - void SetPageSetupData(const wxPageSetupData& pageSetupData); + void SetPageSetupData(const wxPageSetupDialogData& pageSetupData); /// Set the rich text buffer pointer, deleting the existing object if present void SetRichTextBufferPreview(wxRichTextBuffer* buf); diff --git a/samples/stc/defsext.h b/samples/stc/defsext.h index 40eb522afe..89993393d3 100644 --- a/samples/stc/defsext.h +++ b/samples/stc/defsext.h @@ -101,7 +101,7 @@ extern wxString *g_appname; //! global print data, to remember settings during the session extern wxPrintData *g_printData; -extern wxPageSetupData *g_pageSetupData; +extern wxPageSetupDialogData *g_pageSetupData; #endif // wxUSE_PRINTING_ARCHITECTURE diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index 93eb644522..8e5de67641 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -79,7 +79,7 @@ wxString *g_appname = NULL; //! global print data, to remember settings during the session wxPrintData *g_printData = (wxPrintData*) NULL; -wxPageSetupData *g_pageSetupData = (wxPageSetupData*) NULL; +wxPageSetupDialogData *g_pageSetupData = (wxPageSetupDialogData*) NULL; #endif // wxUSE_PRINTING_ARCHITECTURE diff --git a/src/osx/core/printmac.cpp b/src/osx/core/printmac.cpp index 9b1eded8fe..ca27326027 100644 --- a/src/osx/core/printmac.cpp +++ b/src/osx/core/printmac.cpp @@ -460,14 +460,14 @@ bool wxOSXPrintData::TransferTo( wxPrintData &data ) return true ; } -void wxOSXPrintData::TransferFrom( wxPageSetupData *WXUNUSED(data) ) +void wxOSXPrintData::TransferFrom( wxPageSetupDialogData *WXUNUSED(data) ) { // should we setup the page rect here ? // since MacOS sometimes has two same paper rects with different // page rects we could make it roundtrip safe perhaps } -void wxOSXPrintData::TransferTo( wxPageSetupData* data ) +void wxOSXPrintData::TransferTo( wxPageSetupDialogData* data ) { #if wxOSX_USE_COCOA UpdateToPMState(); diff --git a/src/osx/printdlg_osx.cpp b/src/osx/printdlg_osx.cpp index 5d8e99c15e..470a6567fc 100644 --- a/src/osx/printdlg_osx.cpp +++ b/src/osx/printdlg_osx.cpp @@ -80,13 +80,13 @@ wxDC *wxMacPrintDialog::GetPrintDC() IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase) -wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupData *data ) +wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupDialogData *data ) : wxPageSetupDialogBase() { Create( p, data ); } -bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupData *data ) +bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupDialogData *data ) { m_dialogParent = p; @@ -100,14 +100,14 @@ wxMacPageSetupDialog::~wxMacPageSetupDialog() { } -wxPageSetupData& wxMacPageSetupDialog::GetPageSetupDialogData() +wxPageSetupDialogData& wxMacPageSetupDialog::GetPageSetupDialogData() { return m_pageSetupData; } IMPLEMENT_CLASS(wxMacPageMarginsDialog, wxDialog) -wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupData *data) : +wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupDialogData *data) : wxDialog(parent, wxID_ANY, wxString(wxT("Page Margins"))), m_pageSetupDialogData(data) { diff --git a/src/richtext/richtextprint.cpp b/src/richtext/richtextprint.cpp index e15de6c91b..b491ac947b 100644 --- a/src/richtext/richtextprint.cpp +++ b/src/richtext/richtextprint.cpp @@ -477,7 +477,7 @@ void wxRichTextPrinting::SetPrintData(const wxPrintData& printData) (*GetPrintData()) = printData; } -void wxRichTextPrinting::SetPageSetupData(const wxPageSetupData& pageSetupData) +void wxRichTextPrinting::SetPageSetupData(const wxPageSetupDialogData& pageSetupData) { (*GetPageSetupData()) = pageSetupData; }