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

Revert "Switching inner authentication method re-layouts configuration dialog now"

Browse Source 
This reverts commit 67003bd478e1af2c16e922fcbf7bc974affd658e.
This commit is contained in:
Simon Rozman 2016-09-29 15:28:35 +02:00
parent 67003bd478
commit 8d44e750d1
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/TTLS_UI/include/TTLS_UI.h
View File

@ -132,7 +132,6 @@ protected:
virtual bool TransferDataFromWindow(); virtual bool TransferDataFromWindow();
virtual void OnInitDialog(wxInitDialogEvent& event); virtual void OnInitDialog(wxInitDialogEvent& event);
virtual void OnUpdateUI(wxUpdateUIEvent& event); virtual void OnUpdateUI(wxUpdateUIEvent& event);
virtual void OnInnerTypeChoice(wxCommandEvent& event);
/// \endcond /// \endcond
protected: protected:

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

@ -219,14 +219,12 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m
panel_pap->SetFocusFromKbd(); panel_pap->SetFocusFromKbd();
this->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI)); this->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI));
m_inner_type->Connect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxTTLSConfigWindow::OnInnerTypeChoice), NULL, this);
} }
wxTTLSConfigWindow::~wxTTLSConfigWindow() wxTTLSConfigWindow::~wxTTLSConfigWindow()
{ {
this->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI)); this->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxTTLSConfigWindow::OnUpdateUI));
m_inner_type->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler(wxTTLSConfigWindow::OnInnerTypeChoice), NULL, this);
} }
@ -293,9 +291,3 @@ 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);
} }
void wxTTLSConfigWindow::OnInnerTypeChoice(wxCommandEvent& /*event*/)
{
Layout();
}