From 1879e8e6461c89dfda1d958e72cd31372393065e Mon Sep 17 00:00:00 2001 From: Igor Korot Date: Tue, 16 Jul 2019 07:21:59 -0500 Subject: [PATCH] Make wxColourData parameter of wxColourDialog ctor const This parameter is not modified by wxColourDialog (this might have been the case, or at least the plan, some long time ago) and so has no reason not to be "const". Just add the qualifier to ctor and Create() in all ports. Closes https://github.com/wxWidgets/wxWidgets/pull/1421 Closes #12511. --- include/wx/generic/colrdlgg.h | 4 ++-- include/wx/gtk/colordlg.h | 4 ++-- include/wx/msw/colordlg.h | 4 ++-- include/wx/osx/colordlg.h | 4 ++-- include/wx/qt/colordlg.h | 4 ++-- interface/wx/colordlg.h | 4 ++-- src/generic/colrdlgg.cpp | 4 ++-- src/gtk/colordlg.cpp | 4 ++-- src/msw/colordlg.cpp | 2 +- src/osx/carbon/colordlg.cpp | 4 ++-- src/osx/carbon/colordlgosx.mm | 4 ++-- src/qt/colordlg.cpp | 2 +- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index fa74b0107a..fbe8844df7 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -37,10 +37,10 @@ class WXDLLIMPEXP_CORE wxGenericColourDialog : public wxDialog public: wxGenericColourDialog(); wxGenericColourDialog(wxWindow *parent, - wxColourData *data = NULL); + const wxColourData *data = NULL); virtual ~wxGenericColourDialog(); - bool Create(wxWindow *parent, wxColourData *data = NULL); + bool Create(wxWindow *parent, const wxColourData *data = NULL); wxColourData &GetColourData() { return m_colourData; } diff --git a/include/wx/gtk/colordlg.h b/include/wx/gtk/colordlg.h index 784c6545d4..08bf264921 100644 --- a/include/wx/gtk/colordlg.h +++ b/include/wx/gtk/colordlg.h @@ -18,10 +18,10 @@ class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog public: wxColourDialog() {} wxColourDialog(wxWindow *parent, - wxColourData *data = NULL); + const wxColourData *data = NULL); virtual ~wxColourDialog() {} - bool Create(wxWindow *parent, wxColourData *data = NULL); + bool Create(wxWindow *parent, const wxColourData *data = NULL); wxColourData &GetColourData() { return m_data; } diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h index 9de5883b30..27a021f531 100644 --- a/include/wx/msw/colordlg.h +++ b/include/wx/msw/colordlg.h @@ -21,14 +21,14 @@ class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog { public: wxColourDialog() { Init(); } - wxColourDialog(wxWindow *parent, wxColourData *data = NULL) + wxColourDialog(wxWindow *parent, const wxColourData *data = NULL) { Init(); Create(parent, data); } - bool Create(wxWindow *parent, wxColourData *data = NULL); + bool Create(wxWindow *parent, const wxColourData *data = NULL); wxColourData& GetColourData() { return m_colourData; } diff --git a/include/wx/osx/colordlg.h b/include/wx/osx/colordlg.h index 9d3518caf3..978a1ac1ae 100644 --- a/include/wx/osx/colordlg.h +++ b/include/wx/osx/colordlg.h @@ -23,9 +23,9 @@ class WXDLLIMPEXP_CORE wxColourDialog: public wxDialog wxDECLARE_DYNAMIC_CLASS(wxColourDialog); public: wxColourDialog(); - wxColourDialog(wxWindow *parent, wxColourData *data = NULL); + wxColourDialog(wxWindow *parent, const wxColourData *data = NULL); - bool Create(wxWindow *parent, wxColourData *data = NULL); + bool Create(wxWindow *parent, const wxColourData *data = NULL); int ShowModal() wxOVERRIDE; wxColourData& GetColourData() { return m_colourData; } diff --git a/include/wx/qt/colordlg.h b/include/wx/qt/colordlg.h index 48c535fa03..cd2871a238 100644 --- a/include/wx/qt/colordlg.h +++ b/include/wx/qt/colordlg.h @@ -17,9 +17,9 @@ class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog public: wxColourDialog() { } wxColourDialog(wxWindow *parent, - wxColourData *data = NULL) { Create(parent, data); } + const wxColourData *data = NULL) { Create(parent, data); } - bool Create(wxWindow *parent, wxColourData *data = NULL); + bool Create(wxWindow *parent, const wxColourData *data = NULL); wxColourData &GetColourData(); diff --git a/interface/wx/colordlg.h b/interface/wx/colordlg.h index b2344e0870..21fe9cd7dd 100644 --- a/interface/wx/colordlg.h +++ b/interface/wx/colordlg.h @@ -66,7 +66,7 @@ public: @see wxColourData */ - wxColourDialog(wxWindow* parent, wxColourData* data = NULL); + wxColourDialog(wxWindow* parent, const wxColourData* data = NULL); /** Destructor. @@ -76,7 +76,7 @@ public: /** Same as wxColourDialog(). */ - bool Create(wxWindow* parent, wxColourData* data = NULL); + bool Create(wxWindow* parent, const wxColourData* data = NULL); /** Returns the colour data associated with the colour dialog. diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 1ba9c1b5ce..3da7c49c67 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -136,7 +136,7 @@ wxGenericColourDialog::wxGenericColourDialog() } wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent, - wxColourData *data) + const wxColourData *data) { m_whichKind = 1; m_colourSelection = -1; @@ -152,7 +152,7 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) EndModal(wxID_CANCEL); } -bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data) +bool wxGenericColourDialog::Create(wxWindow *parent, const wxColourData *data) { if ( !wxDialog::Create(GetParentForModalDialog(parent, 0), wxID_ANY, _("Choose colour"), diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp index 7f7d11a5ed..d2776a056e 100644 --- a/src/gtk/colordlg.cpp +++ b/src/gtk/colordlg.cpp @@ -35,12 +35,12 @@ static void response(GtkDialog*, int response_id, wxColourDialog* win) wxIMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog); -wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data) +wxColourDialog::wxColourDialog(wxWindow *parent, const wxColourData *data) { Create(parent, data); } -bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) +bool wxColourDialog::Create(wxWindow *parent, const wxColourData *data) { if (data) m_data = *data; diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp index c8e48b5470..ab9a671525 100644 --- a/src/msw/colordlg.cpp +++ b/src/msw/colordlg.cpp @@ -166,7 +166,7 @@ void wxColourDialog::Init() gs_rectDialog.y = 0; } -bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) +bool wxColourDialog::Create(wxWindow *parent, const wxColourData *data) { m_parent = parent; if (data) diff --git a/src/osx/carbon/colordlg.cpp b/src/osx/carbon/colordlg.cpp index fbeb4db8f4..a5f5fd3a7a 100644 --- a/src/osx/carbon/colordlg.cpp +++ b/src/osx/carbon/colordlg.cpp @@ -31,12 +31,12 @@ wxColourDialog::wxColourDialog() m_dialogParent = NULL; } -wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data) +wxColourDialog::wxColourDialog(wxWindow *parent, const wxColourData *data) { Create(parent, data); } -bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) +bool wxColourDialog::Create(wxWindow *parent, const wxColourData *data) { m_dialogParent = parent; diff --git a/src/osx/carbon/colordlgosx.mm b/src/osx/carbon/colordlgosx.mm index 92d6e03df7..e487a06119 100644 --- a/src/osx/carbon/colordlgosx.mm +++ b/src/osx/carbon/colordlgosx.mm @@ -90,12 +90,12 @@ wxColourDialog::wxColourDialog() m_dialogParent = NULL; } -wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data) +wxColourDialog::wxColourDialog(wxWindow *parent, const wxColourData *data) { Create(parent, data); } -bool wxColourDialog::Create(wxWindow *parent, wxColourData *data) +bool wxColourDialog::Create(wxWindow *parent, const wxColourData *data) { m_dialogParent = parent; diff --git a/src/qt/colordlg.cpp b/src/qt/colordlg.cpp index 201bc1b33f..97364cb5da 100644 --- a/src/qt/colordlg.cpp +++ b/src/qt/colordlg.cpp @@ -23,7 +23,7 @@ public: wxIMPLEMENT_DYNAMIC_CLASS(wxColourDialog,wxDialog) -bool wxColourDialog::Create(wxWindow *parent, wxColourData *data ) +bool wxColourDialog::Create(wxWindow *parent, const wxColourData *data ) { m_qtWindow = new wxQtColorDialog( parent, this );