Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxPageSetupDialogData instead of old wxPageSetupData everywhere.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-02-20 21:55:55 +00:00
parent 96dc06fdce
commit 7193abfbc8
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/cmndata.h
View File

@@ -280,7 +280,7 @@ public:
// Use paper id in wxPrintData to set this object's paper size // Use paper id in wxPrintData to set this object's paper size
void CalculatePaperSizeFromId(); void CalculatePaperSizeFromId();
wxPageSetupDialogData& operator=(const wxPageSetupData& data); wxPageSetupDialogData& operator=(const wxPageSetupDialogData& data);
wxPageSetupDialogData& operator=(const wxPrintData& data); wxPageSetupDialogData& operator=(const wxPrintData& data);
wxPrintData& GetPrintData() { return m_printData; } wxPrintData& GetPrintData() { return m_printData; }

2
include/wx/generic/prntdlgg.h
View File

@@ -34,7 +34,7 @@ class WXDLLIMPEXP_FWD_CORE wxCheckBox;
class WXDLLIMPEXP_FWD_CORE wxComboBox; class WXDLLIMPEXP_FWD_CORE wxComboBox;
class WXDLLIMPEXP_FWD_CORE wxStaticText; class WXDLLIMPEXP_FWD_CORE wxStaticText;
class WXDLLIMPEXP_FWD_CORE wxRadioBox; class WXDLLIMPEXP_FWD_CORE wxRadioBox;
class WXDLLIMPEXP_FWD_CORE wxPageSetupData; class WXDLLIMPEXP_FWD_CORE wxPageSetupDialogData;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants

2
include/wx/msw/printdlg.h
View File

@@ -107,7 +107,7 @@ public:
bool ConvertToNative( wxPageSetupDialogData &data ); bool ConvertToNative( wxPageSetupDialogData &data );
bool ConvertFromNative( wxPageSetupDialogData &data ); bool ConvertFromNative( wxPageSetupDialogData &data );
virtual wxPageSetupData& GetPageSetupDialogData() { return m_pageSetupData; } virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageSetupData; }
private: private:
wxPageSetupDialogData m_pageSetupData; wxPageSetupDialogData m_pageSetupData;

14
include/wx/osx/printdlg.h
View File

@@ -58,16 +58,16 @@ private:
class WXDLLIMPEXP_CORE wxMacPageSetupDialog: public wxPageSetupDialogBase class WXDLLIMPEXP_CORE wxMacPageSetupDialog: public wxPageSetupDialogBase
{ {
public: public:
wxMacPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL); wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
virtual ~wxMacPageSetupDialog(); 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(); virtual int ShowModal();
private: private:
wxPageSetupData m_pageSetupData; wxPageSetupDialogData m_pageSetupData;
wxWindow* m_dialogParent; wxWindow* m_dialogParent;
private: private:
@@ -85,14 +85,14 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog
{ {
public: public:
wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupData* data); wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data);
bool TransferToWindow(); bool TransferToWindow();
bool TransferDataFromWindow(); bool TransferDataFromWindow();
virtual wxPageSetupData& GetPageSetupDialogData() { return *m_pageSetupDialogData; } virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; }
private: private:
wxPageSetupData* m_pageSetupDialogData; wxPageSetupDialogData* m_pageSetupDialogData;
wxPoint m_MinMarginTopLeft; wxPoint m_MinMarginTopLeft;
wxPoint m_MinMarginBottomRight; wxPoint m_MinMarginBottomRight;

2
include/wx/richtext/richtextprint.h
View File

@@ -202,7 +202,7 @@ public:
/// Set print and page setup data /// Set print and page setup data
void SetPrintData(const wxPrintData& printData); 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 /// Set the rich text buffer pointer, deleting the existing object if present
void SetRichTextBufferPreview(wxRichTextBuffer* buf); void SetRichTextBufferPreview(wxRichTextBuffer* buf);

2
samples/stc/defsext.h
View File

@@ -101,7 +101,7 @@ extern wxString *g_appname;
//! global print data, to remember settings during the session //! global print data, to remember settings during the session
extern wxPrintData *g_printData; extern wxPrintData *g_printData;
extern wxPageSetupData *g_pageSetupData; extern wxPageSetupDialogData *g_pageSetupData;
#endif // wxUSE_PRINTING_ARCHITECTURE #endif // wxUSE_PRINTING_ARCHITECTURE

2
samples/stc/stctest.cpp
View File

@@ -79,7 +79,7 @@ wxString *g_appname = NULL;
//! global print data, to remember settings during the session //! global print data, to remember settings during the session
wxPrintData *g_printData = (wxPrintData*) NULL; wxPrintData *g_printData = (wxPrintData*) NULL;
wxPageSetupData *g_pageSetupData = (wxPageSetupData*) NULL; wxPageSetupDialogData *g_pageSetupData = (wxPageSetupDialogData*) NULL;
#endif // wxUSE_PRINTING_ARCHITECTURE #endif // wxUSE_PRINTING_ARCHITECTURE

4
src/osx/core/printmac.cpp
View File

@@ -460,14 +460,14 @@ bool wxOSXPrintData::TransferTo( wxPrintData &data )
return true ; return true ;
} }
void wxOSXPrintData::TransferFrom( wxPageSetupData *WXUNUSED(data) ) void wxOSXPrintData::TransferFrom( wxPageSetupDialogData *WXUNUSED(data) )
{ {
// should we setup the page rect here ? // should we setup the page rect here ?
// since MacOS sometimes has two same paper rects with different // since MacOS sometimes has two same paper rects with different
// page rects we could make it roundtrip safe perhaps // page rects we could make it roundtrip safe perhaps
} }
void wxOSXPrintData::TransferTo( wxPageSetupData* data ) void wxOSXPrintData::TransferTo( wxPageSetupDialogData* data )
{ {
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
UpdateToPMState(); UpdateToPMState();

8
src/osx/printdlg_osx.cpp
View File

@@ -80,13 +80,13 @@ wxDC *wxMacPrintDialog::GetPrintDC()
IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase) IMPLEMENT_CLASS(wxMacPageSetupDialog, wxPageSetupDialogBase)
wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupData *data ) wxMacPageSetupDialog::wxMacPageSetupDialog( wxWindow *p, wxPageSetupDialogData *data )
: wxPageSetupDialogBase() : wxPageSetupDialogBase()
{ {
Create( p, data ); Create( p, data );
} }
bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupData *data ) bool wxMacPageSetupDialog::Create( wxWindow *p, wxPageSetupDialogData *data )
{ {
m_dialogParent = p; m_dialogParent = p;
@@ -100,14 +100,14 @@ wxMacPageSetupDialog::~wxMacPageSetupDialog()
{ {
} }
wxPageSetupData& wxMacPageSetupDialog::GetPageSetupDialogData() wxPageSetupDialogData& wxMacPageSetupDialog::GetPageSetupDialogData()
{ {
return m_pageSetupData; return m_pageSetupData;
} }
IMPLEMENT_CLASS(wxMacPageMarginsDialog, wxDialog) IMPLEMENT_CLASS(wxMacPageMarginsDialog, wxDialog)
wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupData *data) : wxMacPageMarginsDialog::wxMacPageMarginsDialog(wxFrame *parent, wxPageSetupDialogData *data) :
wxDialog(parent, wxID_ANY, wxString(wxT("Page Margins"))), wxDialog(parent, wxID_ANY, wxString(wxT("Page Margins"))),
m_pageSetupDialogData(data) m_pageSetupDialogData(data)
{ {

2
src/richtext/richtextprint.cpp
View File

@@ -477,7 +477,7 @@ void wxRichTextPrinting::SetPrintData(const wxPrintData& printData)
(*GetPrintData()) = printData; (*GetPrintData()) = printData;
} }
void wxRichTextPrinting::SetPageSetupData(const wxPageSetupData& pageSetupData) void wxRichTextPrinting::SetPageSetupData(const wxPageSetupDialogData& pageSetupData)
{ {
(*GetPageSetupData()) = pageSetupData; (*GetPageSetupData()) = pageSetupData;
} }