From 2bc43869b02cfac17bf2a49fdc9cf1094da2a3a2 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 29 Sep 2016 15:28:35 +0200 Subject: [PATCH] Revert "Switching inner authentication method re-layouts configuration dialog now" This reverts commit 67003bd478e1af2c16e922fcbf7bc974affd658e. --- lib/TTLS_UI/include/TTLS_UI.h | 1 - lib/TTLS_UI/src/TTLS_UI.cpp | 8 -------- 2 files changed, 9 deletions(-) diff --git a/lib/TTLS_UI/include/TTLS_UI.h b/lib/TTLS_UI/include/TTLS_UI.h index 8ec375b..5e283e3 100644 --- a/lib/TTLS_UI/include/TTLS_UI.h +++ b/lib/TTLS_UI/include/TTLS_UI.h @@ -133,7 +133,6 @@ protected: virtual bool TransferDataFromWindow(); virtual void OnInitDialog(wxInitDialogEvent& event); virtual void OnUpdateUI(wxUpdateUIEvent& event); - virtual void OnInnerTypeChoice(wxCommandEvent& event); /// \endcond protected: diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index 08a3c17..2105730 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -222,14 +222,12 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m panel_pap->SetFocusFromKbd(); this->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI)); - m_inner_type->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxTTLSConfigWindow::OnInnerTypeChoice), NULL, this); } wxTTLSConfigWindow::~wxTTLSConfigWindow() { this->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI)); - m_inner_type->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxTTLSConfigWindow::OnInnerTypeChoice), NULL, this); } @@ -296,9 +294,3 @@ void wxTTLSConfigWindow::OnUpdateUI(wxUpdateUIEvent& /*event*/) { m_inner_type->GetChoiceCtrl()->Enable(!m_prov.m_read_only); } - - -void wxTTLSConfigWindow::OnInnerTypeChoice(wxCommandEvent& /*event*/) -{ - Layout(); -}