Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Clean-up

Browse Source
This commit is contained in:
Simon Rozman 2016-08-15 18:35:15 +02:00
parent d8ccf7cbc0
commit 7b3ecda484
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/EAPBase_UI/include/EAP_UI.h
View File

@ -572,31 +572,26 @@ protected:
virtual bool TransferDataToWindow() virtual bool TransferDataToWindow()
{ {
// Inherited TransferDataToWindow() calls m_cred.retrieve().
// Therefore, call it now, to set m_cred.
if (!wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::TransferDataToWindow())
return false;
m_identity->SetValue(m_cred.m_identity); m_identity->SetValue(m_cred.m_identity);
m_identity->SetSelection(0, -1); m_identity->SetSelection(0, -1);
m_password->SetValue(m_cred.m_password.empty() ? wxEmptyString : s_dummy_password); m_password->SetValue(m_cred.m_password.empty() ? wxEmptyString : s_dummy_password);
return true; return wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::TransferDataToWindow();
} }
virtual bool TransferDataFromWindow() virtual bool TransferDataFromWindow()
{ {
m_cred.m_identity = m_identity->GetValue(); if (!wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::TransferDataFromWindow())
return false;
m_cred.m_identity = m_identity->GetValue();
wxString pass = m_password->GetValue(); wxString pass = m_password->GetValue();
if (pass.compare(s_dummy_password) != 0) { if (pass.compare(s_dummy_password) != 0) {
m_cred.m_password = pass; m_cred.m_password = pass;
pass.assign(pass.length(), wxT('*')); pass.assign(pass.length(), wxT('*'));
} }
// Inherited TransferDataFromWindow() calls m_cred.store(). return true;
// Therefore, call it only now, that m_cred is set.
return wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::TransferDataFromWindow();
} }
virtual void OnUpdateUI(wxUpdateUIEvent& event) virtual void OnUpdateUI(wxUpdateUIEvent& event)