From 03358170f47cdf6f640318f45645b32812a0066d Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 15 Jun 2016 22:58:07 +0200 Subject: [PATCH] EAP-TTLS PAP credentials panel loads correctly now --- lib/TTLS_UI/src/TTLS_UI.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index 30a4344..9e5350d 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -147,7 +147,9 @@ bool wxEAPTTLSConfig::TransferDataToWindow() } else wxFAIL_MSG(wxT("Unsupported inner authentication method type.")); - return wxScrolledWindow::TransferDataToWindow(); + // Do not invoke inherited TransferDataToWindow(), as it will call others TransferDataToWindow(). + // This will handle wxEAPTTLSConfig::OnInitDialog() via wxEVT_INIT_DIALOG forwarding. + return true /*wxScrolledWindow::TransferDataToWindow()*/; } @@ -171,6 +173,9 @@ bool wxEAPTTLSConfig::TransferDataFromWindow() void wxEAPTTLSConfig::OnInitDialog(wxInitDialogEvent& event) { + // Call TransferDataToWindow() manually, as wxScrolledWindow somehow skips that. + TransferDataToWindow(); + // Forward the event to child panels. m_outer_identity->GetEventHandler()->ProcessEvent(event); m_tls->GetEventHandler()->ProcessEvent(event);