diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj index bf84d36..d739791 100644 --- a/CredWrite/CredWrite.vcxproj +++ b/CredWrite/CredWrite.vcxproj @@ -87,6 +87,7 @@ + Create diff --git a/CredWrite/CredWrite.vcxproj.filters b/CredWrite/CredWrite.vcxproj.filters index 7e3a58f..d59c8f1 100644 --- a/CredWrite/CredWrite.vcxproj.filters +++ b/CredWrite/CredWrite.vcxproj.filters @@ -29,6 +29,9 @@ Source Files + + Source Files + diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp index 33c96be..8debf3a 100644 Binary files a/CredWrite/Main.cpp and b/CredWrite/Main.cpp differ diff --git a/CredWrite/StdAfx.h b/CredWrite/StdAfx.h index 5d3a928..2d67277 100644 Binary files a/CredWrite/StdAfx.h and b/CredWrite/StdAfx.h differ diff --git a/EAPMethods/Doxyfile b/EAPMethods/Doxyfile index 36bda1b..9a2bda5 100644 --- a/EAPMethods/Doxyfile +++ b/EAPMethods/Doxyfile @@ -789,7 +789,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = +EXCLUDE = res # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj index 1472d67..f886e91 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj @@ -82,6 +82,7 @@ + @@ -97,6 +98,7 @@ + diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters index 7da1c1c..07f5328 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters @@ -60,6 +60,9 @@ Header Files + + Header Files + @@ -98,6 +101,9 @@ Source Files + + Source Files + diff --git a/EAPMethods/EAPTTLSUI/StdAfx.h b/EAPMethods/EAPTTLSUI/StdAfx.h index 57e25be..4c12f26 100644 Binary files a/EAPMethods/EAPTTLSUI/StdAfx.h and b/EAPMethods/EAPTTLSUI/StdAfx.h differ diff --git a/EAPMethods/include/EAP.h b/EAPMethods/include/EAP.h index e5a9bd3..b1a2ddf 100644 Binary files a/EAPMethods/include/EAP.h and b/EAPMethods/include/EAP.h differ diff --git a/EAPMethods/include/EAP_UI.h b/EAPMethods/include/EAP_UI.h index 9b985d9..fe84eaa 100644 Binary files a/EAPMethods/include/EAP_UI.h and b/EAPMethods/include/EAP_UI.h differ diff --git a/EAPMethods/include/PAP.h b/EAPMethods/include/PAP.h index 92709cf..1520fa6 100644 Binary files a/EAPMethods/include/PAP.h and b/EAPMethods/include/PAP.h differ diff --git a/EAPMethods/include/PAP_UI.h b/EAPMethods/include/PAP_UI.h new file mode 100644 index 0000000..76c8f9d --- /dev/null +++ b/EAPMethods/include/PAP_UI.h @@ -0,0 +1,53 @@ +/* + Copyright 2015-2016 Amebis + Copyright 2016 GÉANT + + This file is part of GÉANTLink. + + GÉANTLink is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + GÉANTLink is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GÉANTLink. If not, see . +*/ + +#include "PAP.h" + +typedef wxEAPCredentialsConfigPanel wxPAPCredentialsConfigPanel; +class wxPAPConfigPanel; + +#pragma once + + +/// +/// PAP configuration panel +/// +class wxPAPConfigPanel : public wxPanel +{ +public: + /// + /// Constructs a configuration panel + /// + wxPAPConfigPanel(eap::config_pap &cfg, LPCTSTR pszCredTarget, wxWindow* parent); + + /// + /// Destructs the configuration panel + /// + virtual ~wxPAPConfigPanel(); + +protected: + /// \cond internal + virtual void OnInitDialog(wxInitDialogEvent& event); + /// \endcond + +protected: + wxPAPCredentialsConfigPanel *m_credentials; ///< Credentials configuration panel + wxStaticText *m_label; ///< No-configuration notice +}; diff --git a/EAPMethods/include/TLS.h b/EAPMethods/include/TLS.h index f4c4b79..8d44397 100644 Binary files a/EAPMethods/include/TLS.h and b/EAPMethods/include/TLS.h differ diff --git a/EAPMethods/include/TLS_UI.h b/EAPMethods/include/TLS_UI.h index 1e4c717..3d7e330 100644 Binary files a/EAPMethods/include/TLS_UI.h and b/EAPMethods/include/TLS_UI.h differ diff --git a/EAPMethods/include/TTLS.h b/EAPMethods/include/TTLS.h index 18595fd..3d375ce 100644 Binary files a/EAPMethods/include/TTLS.h and b/EAPMethods/include/TTLS.h differ diff --git a/EAPMethods/include/TTLS_UI.h b/EAPMethods/include/TTLS_UI.h index bd70f3c..1319f18 100644 Binary files a/EAPMethods/include/TTLS_UI.h and b/EAPMethods/include/TTLS_UI.h differ diff --git a/EAPMethods/res/wxEAP_UI.cpp b/EAPMethods/res/wxEAP_UI.cpp index ffd1c33..f84504e 100644 --- a/EAPMethods/res/wxEAP_UI.cpp +++ b/EAPMethods/res/wxEAP_UI.cpp @@ -15,16 +15,16 @@ wxEAPConfigDialogBase::wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id, c { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - wxBoxSizer* sz_content; - sz_content = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); m_banner = new wxEAPBannerPanel( this ); - sz_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - sz_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 ); + sb_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 ); m_buttons = new wxStdDialogButtonSizer(); m_buttonsOK = new wxButton( this, wxID_OK ); @@ -33,12 +33,12 @@ wxEAPConfigDialogBase::wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id, c m_buttons->AddButton( m_buttonsCancel ); m_buttons->Realize(); - sz_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); - this->SetSizer( sz_content ); + this->SetSizer( sb_content ); this->Layout(); - sz_content->Fit( this ); + sb_content->Fit( this ); // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPConfigDialogBase::OnInitDialog ) ); @@ -55,17 +55,17 @@ wxEAPCredentialsDialogBase::wxEAPCredentialsDialogBase( wxWindow* parent, wxWind { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - wxBoxSizer* sz_content; - sz_content = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); m_banner = new wxEAPBannerPanel( this ); - sz_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); m_panels = new wxBoxSizer( wxVERTICAL ); - sz_content->Add( m_panels, 1, wxEXPAND|wxALL, 5 ); + sb_content->Add( m_panels, 1, wxEXPAND|wxALL, 5 ); m_buttons = new wxStdDialogButtonSizer(); m_buttonsOK = new wxButton( this, wxID_OK ); @@ -74,16 +74,22 @@ wxEAPCredentialsDialogBase::wxEAPCredentialsDialogBase( wxWindow* parent, wxWind m_buttons->AddButton( m_buttonsCancel ); m_buttons->Realize(); - sz_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); - this->SetSizer( sz_content ); + this->SetSizer( sb_content ); this->Layout(); - sz_content->Fit( this ); + sb_content->Fit( this ); + + // Connect Events + this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPCredentialsDialogBase::OnInitDialog ) ); } wxEAPCredentialsDialogBase::~wxEAPCredentialsDialogBase() { + // Disconnect Events + this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPCredentialsDialogBase::OnInitDialog ) ); + } wxEAPBannerPanelBase::wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) @@ -96,7 +102,7 @@ wxEAPBannerPanelBase::wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id, con m_title = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); m_title->Wrap( -1 ); - m_title->SetFont( wxFont( 14, 70, 90, 90, false, wxEmptyString ) ); + m_title->SetFont( wxFont( 18, 70, 90, 90, false, wxEmptyString ) ); m_title->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); sc_content->Add( m_title, 0, wxALL|wxEXPAND, 5 ); @@ -217,7 +223,7 @@ wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent sb_credentials_tbl->Add( m_identity_label, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAINUser, etc.)") ); + m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAIN\\User, etc.)") ); sb_credentials_tbl->Add( m_identity, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); diff --git a/EAPMethods/res/wxEAP_UI.fbp b/EAPMethods/res/wxEAP_UI.fbp index 8dcd5e4..9a233b0 100644 --- a/EAPMethods/res/wxEAP_UI.fbp +++ b/EAPMethods/res/wxEAP_UI.fbp @@ -90,7 +90,7 @@ - sz_content + sb_content wxVERTICAL none @@ -331,7 +331,7 @@ - + OnInitDialog @@ -354,7 +354,7 @@ - sz_content + sb_content wxVERTICAL none @@ -566,7 +566,7 @@ 1 wxSYS_COLOUR_HIGHLIGHTTEXT 1 - ,90,90,14,70,0 + ,90,90,18,70,0 0 0 wxID_ANY @@ -1644,7 +1644,7 @@ 0 - Enter your user name here (user@domain.org, DOMAINUser, etc.) + Enter your user name here (user@domain.org, DOMAIN\User, etc.) wxFILTER_NONE wxDefaultValidator diff --git a/EAPMethods/res/wxEAP_UI.h b/EAPMethods/res/wxEAP_UI.h index d3427a8..1d5f127 100644 --- a/EAPMethods/res/wxEAP_UI.h +++ b/EAPMethods/res/wxEAP_UI.h @@ -71,6 +71,10 @@ class wxEAPCredentialsDialogBase : public wxDialog wxStdDialogButtonSizer* m_buttons; wxButton* m_buttonsOK; wxButton* m_buttonsCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } + public: diff --git a/EAPMethods/res/wxTLS_UI.cpp b/EAPMethods/res/wxTLS_UI.cpp index 3a8fe16..04ac84e 100644 --- a/EAPMethods/res/wxTLS_UI.cpp +++ b/EAPMethods/res/wxTLS_UI.cpp @@ -11,7 +11,7 @@ /////////////////////////////////////////////////////////////////////////// -wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +wxEAPTLSServerTrustConfigPanelBase::wxEAPTLSServerTrustConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_server_trust; sb_server_trust = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Server Trust") ), wxVERTICAL ); @@ -96,21 +96,21 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i this->Layout(); // Connect Events - m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCA ), NULL, this ); - m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this ); - m_root_ca_add_store->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddStore ), NULL, this ); - m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this ); - m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); + m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCA ), NULL, this ); + m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_store->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddStore ), NULL, this ); + m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddFile ), NULL, this ); + m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCARemove ), NULL, this ); } -wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase() +wxEAPTLSServerTrustConfigPanelBase::~wxEAPTLSServerTrustConfigPanelBase() { // Disconnect Events - m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCA ), NULL, this ); - m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this ); - m_root_ca_add_store->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddStore ), NULL, this ); - m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this ); - m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); + m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCA ), NULL, this ); + m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_store->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddStore ), NULL, this ); + m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddFile ), NULL, this ); + m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCARemove ), NULL, this ); } diff --git a/EAPMethods/res/wxTLS_UI.fbp b/EAPMethods/res/wxTLS_UI.fbp index 80959a4..e2baaaf 100644 --- a/EAPMethods/res/wxTLS_UI.fbp +++ b/EAPMethods/res/wxTLS_UI.fbp @@ -40,7 +40,7 @@ wxID_ANY - wxEAPTLSConfigPanelBase + wxEAPTLSServerTrustConfigPanelBase 500,-1 diff --git a/EAPMethods/res/wxTLS_UI.h b/EAPMethods/res/wxTLS_UI.h index 9d722c9..8a98e75 100644 --- a/EAPMethods/res/wxTLS_UI.h +++ b/EAPMethods/res/wxTLS_UI.h @@ -34,9 +34,9 @@ /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPTLSConfigPanelBase +/// Class wxEAPTLSServerTrustConfigPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPTLSConfigPanelBase : public wxPanel +class wxEAPTLSServerTrustConfigPanelBase : public wxPanel { private: @@ -62,8 +62,8 @@ class wxEAPTLSConfigPanelBase : public wxPanel public: - wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxEAPTLSConfigPanelBase(); + wxEAPTLSServerTrustConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxEAPTLSServerTrustConfigPanelBase(); }; diff --git a/EAPMethods/src/EAP.cpp b/EAPMethods/src/EAP.cpp index f9f0b5c..fa36737 100644 Binary files a/EAPMethods/src/EAP.cpp and b/EAPMethods/src/EAP.cpp differ diff --git a/EAPMethods/src/EAP_UI.cpp b/EAPMethods/src/EAP_UI.cpp index 14e1893..9a099c8 100644 Binary files a/EAPMethods/src/EAP_UI.cpp and b/EAPMethods/src/EAP_UI.cpp differ diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp index 1f1ee82..62fa9b2 100644 Binary files a/EAPMethods/src/Main.cpp and b/EAPMethods/src/Main.cpp differ diff --git a/EAPMethods/src/Main_UI.cpp b/EAPMethods/src/Main_UI.cpp index a97cbad..b9c1920 100644 Binary files a/EAPMethods/src/Main_UI.cpp and b/EAPMethods/src/Main_UI.cpp differ diff --git a/EAPMethods/src/PAP.cpp b/EAPMethods/src/PAP.cpp index 8ead041..166530f 100644 Binary files a/EAPMethods/src/PAP.cpp and b/EAPMethods/src/PAP.cpp differ diff --git a/EAPMethods/src/PAP_UI.cpp b/EAPMethods/src/PAP_UI.cpp new file mode 100644 index 0000000..e09cfc6 --- /dev/null +++ b/EAPMethods/src/PAP_UI.cpp @@ -0,0 +1,68 @@ +/* + Copyright 2015-2016 Amebis + Copyright 2016 GÉANT + + This file is part of GÉANTLink. + + GÉANTLink is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + GÉANTLink is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GÉANTLink. If not, see . +*/ + +#include + + +////////////////////////////////////////////////////////////////////// +// wxPAPConfigPanel +////////////////////////////////////////////////////////////////////// + +wxPAPConfigPanel::wxPAPConfigPanel(eap::config_pap &cfg, LPCTSTR pszCredTarget, wxWindow* parent) : wxPanel(parent) +{ + wxBoxSizer* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); + + if (cfg.m_allow_save) { + m_credentials = new wxPAPCredentialsConfigPanel(cfg, pszCredTarget, this); + sb_content->Add(m_credentials, 0, wxALL|wxEXPAND, 5); + + m_label = NULL; + } else { + m_credentials = NULL; + + m_label = new wxStaticText(this, wxID_ANY, _("This method requires no additional settings."), wxDefaultPosition, wxDefaultSize, 0); + m_label->Wrap(-1); + sb_content->Add(m_label, 0, wxALL|wxEXPAND, 5); + } + + sb_content->Add(10, 10, 1, wxEXPAND, 5); + + this->SetSizer(sb_content); + this->Layout(); + + // Connect Events + this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxPAPConfigPanel::OnInitDialog)); +} + + +wxPAPConfigPanel::~wxPAPConfigPanel() +{ + // Disconnect Events + this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxPAPConfigPanel::OnInitDialog)); +} + + +void wxPAPConfigPanel::OnInitDialog(wxInitDialogEvent& event) +{ + // Forward the event to child panels. + if (m_credentials) + m_credentials->GetEventHandler()->ProcessEvent(event); +} diff --git a/EAPMethods/src/TLS.cpp b/EAPMethods/src/TLS.cpp index 32a00a6..300d787 100644 Binary files a/EAPMethods/src/TLS.cpp and b/EAPMethods/src/TLS.cpp differ diff --git a/EAPMethods/src/TLS_UI.cpp b/EAPMethods/src/TLS_UI.cpp index 0ca4260..0c3f726 100644 Binary files a/EAPMethods/src/TLS_UI.cpp and b/EAPMethods/src/TLS_UI.cpp differ diff --git a/EAPMethods/src/TTLS.cpp b/EAPMethods/src/TTLS.cpp index b6eed43..f4052e7 100644 Binary files a/EAPMethods/src/TTLS.cpp and b/EAPMethods/src/TTLS.cpp differ diff --git a/EAPMethods/src/TTLS_UI.cpp b/EAPMethods/src/TTLS_UI.cpp index d0e7c8c..ddec728 100644 Binary files a/EAPMethods/src/TTLS_UI.cpp and b/EAPMethods/src/TTLS_UI.cpp differ