From 9ecc6bc2f1559a5adc988f4e5c408a5c450a491c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 30 Aug 2012 20:25:24 +0000 Subject: [PATCH] Explicitly reject the use of wxTE_PASSWORD in generic wxSpinCtrl. wxTE_PASSWORD has the same value as wxALIGN_CENTRE_VERTICAL which could be implicitly specified as part of wxALIGN_CENTRE, but should never be used with wxSpinCtrl, so explicitly filter it out when creating the associated wxTextCtrl. Closes #14452. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/spinctlg.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 6887f4eae7..a6b11fece1 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -65,7 +65,11 @@ class wxSpinCtrlTextGeneric : public wxTextCtrl public: wxSpinCtrlTextGeneric(wxSpinCtrlGenericBase *spin, const wxString& value, long style=0) : wxTextCtrl(spin->GetParent(), wxID_ANY, value, wxDefaultPosition, wxDefaultSize, - style & (wxALIGN_MASK | wxTE_PROCESS_ENTER)) + // This is tricky: we want to honour any alignment flags + // but not wxALIGN_CENTER_VERTICAL because it's the same + // as wxTE_PASSWORD and we definitely don't want to show + // asterisks in spin control. + style & (wxALIGN_MASK | wxTE_PROCESS_ENTER) & ~wxTE_PASSWORD) { m_spin = spin; -- 2.45.2