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

OnUpdateUI events are propagated to parent classes now

Browse Source
This commit is contained in:
Simon Rozman 2016-09-30 09:46:51 +02:00
parent 2bc43869b0
commit 7d986b82d8
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -240,8 +240,10 @@ protected:
} }
virtual void OnUpdateUI(wxUpdateUIEvent& /*event*/) virtual void OnUpdateUI(wxUpdateUIEvent& event)
{ {
wxEAPConfigDialogBase::OnUpdateUI(event);
int idx = m_providers->GetSelection(); int idx = m_providers->GetSelection();
if (idx != wxNOT_FOUND) { if (idx != wxNOT_FOUND) {
eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider(); eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider();
@ -630,8 +632,10 @@ protected:
} }
virtual void OnUpdateUI(wxUpdateUIEvent& /*event*/) virtual void OnUpdateUI(wxUpdateUIEvent& event)
{ {
wxEAPCredentialsConfigPanelBase::OnUpdateUI(event);
if (m_cfg.m_allow_save) { if (m_cfg.m_allow_save) {
if (m_storage->GetValue()) { if (m_storage->GetValue()) {
m_storage_identity->Enable(true); m_storage_identity->Enable(true);

8
lib/TLS_UI/src/TLS_UI.cpp
View File

@ -382,8 +382,10 @@ bool wxTLSCredentialsPanel::TransferDataFromWindow()
} }
void wxTLSCredentialsPanel::OnUpdateUI(wxUpdateUIEvent& /*event*/) void wxTLSCredentialsPanel::OnUpdateUI(wxUpdateUIEvent& event)
{ {
wxEAPCredentialsPanel<eap::credentials_tls, wxTLSCredentialsPanelBase>::OnUpdateUI(event);
if (!m_is_config && m_cfg.m_use_cred) { if (!m_is_config && m_cfg.m_use_cred) {
// Credential prompt mode & Using configured credentials // Credential prompt mode & Using configured credentials
m_certificate->Enable(false); m_certificate->Enable(false);
@ -452,8 +454,10 @@ bool wxTLSServerTrustPanel::TransferDataFromWindow()
} }
void wxTLSServerTrustPanel::OnUpdateUI(wxUpdateUIEvent& /*event*/) void wxTLSServerTrustPanel::OnUpdateUI(wxUpdateUIEvent& event)
{ {
wxTLSServerTrustPanelBase::OnUpdateUI(event);
if (m_prov.m_read_only) { if (m_prov.m_read_only) {
// This is provider-locked configuration. Disable controls. // This is provider-locked configuration. Disable controls.
m_root_ca_add_store->Enable(false); m_root_ca_add_store->Enable(false);

8
lib/TTLS_UI/src/TTLS_UI.cpp
View File

@ -144,8 +144,10 @@ bool wxTTLSConfigPanel::TransferDataFromWindow()
} }
void wxTTLSConfigPanel::OnUpdateUI(wxUpdateUIEvent& /*event*/) void wxTTLSConfigPanel::OnUpdateUI(wxUpdateUIEvent& event)
{ {
wxTTLSConfigPanelBase::OnUpdateUI(event);
if (m_prov.m_read_only) { if (m_prov.m_read_only) {
// This is provider-locked configuration. Disable controls. // This is provider-locked configuration. Disable controls.
m_outer_identity_same ->Enable(false); m_outer_identity_same ->Enable(false);
@ -290,7 +292,9 @@ void wxTTLSConfigWindow::OnInitDialog(wxInitDialogEvent& event)
} }
void wxTTLSConfigWindow::OnUpdateUI(wxUpdateUIEvent& /*event*/) void wxTTLSConfigWindow::OnUpdateUI(wxUpdateUIEvent& event)
{ {
m_inner_type->GetChoiceCtrl()->Enable(!m_prov.m_read_only); m_inner_type->GetChoiceCtrl()->Enable(!m_prov.m_read_only);
event.Skip();
} }