From 10054b02408ca220b59a942b8fac957b31f5d168 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 22 Sep 2016 11:06:11 +0200 Subject: [PATCH] wxEAPCredentialsPromptTLSPanel >> wxTLSCredentialsPanel --- lib/TLS_UI/include/TLS_UI.h | 8 ++++---- lib/TLS_UI/res/wxTLS_UI.cpp | 8 ++++---- lib/TLS_UI/res/wxTLS_UI.fbp | 2 +- lib/TLS_UI/res/wxTLS_UI.h | 8 ++++---- lib/TLS_UI/src/TLS_UI.cpp | 16 ++++++++-------- lib/TTLS_UI/include/TTLS_UI.h | 2 +- lib/TTLS_UI/src/TTLS_UI.cpp | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/TLS_UI/include/TLS_UI.h b/lib/TLS_UI/include/TLS_UI.h index adbc55c..f766193 100644 --- a/lib/TLS_UI/include/TLS_UI.h +++ b/lib/TLS_UI/include/TLS_UI.h @@ -58,7 +58,7 @@ class wxFQDNListValidator; /// /// TLS credential panel /// -class wxEAPCredentialsPromptTLSPanel; +class wxTLSCredentialsPanel; /// /// TLS server trust configuration panel @@ -68,7 +68,7 @@ class wxTLSServerTrustPanel; /// /// TLS credentials configuration panel /// -typedef wxEAPCredentialsConfigPanel wxEAPCredentialsPromptTLSConfigPanel; +typedef wxEAPCredentialsConfigPanel wxEAPCredentialsPromptTLSConfigPanel; /// /// TLS configuration panel @@ -248,7 +248,7 @@ protected: }; -class wxEAPCredentialsPromptTLSPanel : public wxEAPCredentialsPromptPanel +class wxTLSCredentialsPanel : public wxEAPCredentialsPromptPanel { public: /// @@ -260,7 +260,7 @@ public: /// \param[in] parent Parent window /// \param[in] is_config Is this panel used to pre-enter credentials? When \c true, the "Remember" checkbox is always selected and disabled. /// - wxEAPCredentialsPromptTLSPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, eap::credentials_tls &cred, wxWindow* parent, bool is_config = false); + wxTLSCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, eap::credentials_tls &cred, wxWindow* parent, bool is_config = false); protected: /// \cond internal diff --git a/lib/TLS_UI/res/wxTLS_UI.cpp b/lib/TLS_UI/res/wxTLS_UI.cpp index 1d3daab..45f8a60 100644 --- a/lib/TLS_UI/res/wxTLS_UI.cpp +++ b/lib/TLS_UI/res/wxTLS_UI.cpp @@ -114,7 +114,7 @@ wxEAPTLSServerTrustConfigPanelBase::~wxEAPTLSServerTrustConfigPanelBase() } -wxEAPCredentialsPromptTLSPanelBase::wxEAPCredentialsPromptTLSPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxEAPCredentialsPanelBase( parent, id, pos, size, style ) +wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxEAPCredentialsPanelBase( parent, id, pos, size, style ) { m_sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("TLS Client Certificate") ), wxVERTICAL ); @@ -167,12 +167,12 @@ wxEAPCredentialsPromptTLSPanelBase::wxEAPCredentialsPromptTLSPanelBase( wxWindow this->Layout(); // Connect Events - this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPCredentialsPromptTLSPanelBase::OnUpdateUI ) ); + this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSCredentialsPanelBase::OnUpdateUI ) ); } -wxEAPCredentialsPromptTLSPanelBase::~wxEAPCredentialsPromptTLSPanelBase() +wxTLSCredentialsPanelBase::~wxTLSCredentialsPanelBase() { // Disconnect Events - this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPCredentialsPromptTLSPanelBase::OnUpdateUI ) ); + this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSCredentialsPanelBase::OnUpdateUI ) ); } diff --git a/lib/TLS_UI/res/wxTLS_UI.fbp b/lib/TLS_UI/res/wxTLS_UI.fbp index 575750d..1dd3e0a 100644 --- a/lib/TLS_UI/res/wxTLS_UI.fbp +++ b/lib/TLS_UI/res/wxTLS_UI.fbp @@ -1013,7 +1013,7 @@ wxID_ANY - wxEAPCredentialsPromptTLSPanelBase + wxTLSCredentialsPanelBase 500,-1 wxEAPCredentialsPanelBase; ../../EAPBase_UI/include/wxEAP_UIBase.h diff --git a/lib/TLS_UI/res/wxTLS_UI.h b/lib/TLS_UI/res/wxTLS_UI.h index 31e851c..5732cdb 100644 --- a/lib/TLS_UI/res/wxTLS_UI.h +++ b/lib/TLS_UI/res/wxTLS_UI.h @@ -69,9 +69,9 @@ class wxEAPTLSServerTrustConfigPanelBase : public wxPanel }; /////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPCredentialsPromptTLSPanelBase +/// Class wxTLSCredentialsPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPCredentialsPromptTLSPanelBase : public wxEAPCredentialsPanelBase +class wxTLSCredentialsPanelBase : public wxEAPCredentialsPanelBase { private: @@ -91,8 +91,8 @@ class wxEAPCredentialsPromptTLSPanelBase : public wxEAPCredentialsPanelBase public: - wxEAPCredentialsPromptTLSPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxEAPCredentialsPromptTLSPanelBase(); + wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxTLSCredentialsPanelBase(); }; diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp index b153d06..66dd5ea 100644 --- a/lib/TLS_UI/src/TLS_UI.cpp +++ b/lib/TLS_UI/src/TLS_UI.cpp @@ -308,11 +308,11 @@ bool wxFQDNListValidator::Parse(const wxString &val_in, size_t i_start, size_t i ////////////////////////////////////////////////////////////////////// -// wxEAPCredentialsPromptTLSPanel +// wxTLSCredentialsPanel ////////////////////////////////////////////////////////////////////// -wxEAPCredentialsPromptTLSPanel::wxEAPCredentialsPromptTLSPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, eap::credentials_tls &cred, wxWindow* parent, bool is_config) : - wxEAPCredentialsPromptPanel(prov, cfg, cred, parent, is_config) +wxTLSCredentialsPanel::wxTLSCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, eap::credentials_tls &cred, wxWindow* parent, bool is_config) : + wxEAPCredentialsPromptPanel(prov, cfg, cred, parent, is_config) { // Load and set icon. winstd::library lib_shell32; @@ -321,7 +321,7 @@ wxEAPCredentialsPromptTLSPanel::wxEAPCredentialsPromptTLSPanel(const eap::config } -bool wxEAPCredentialsPromptTLSPanel::TransferDataToWindow() +bool wxTLSCredentialsPanel::TransferDataToWindow() { // Populate certificate list. m_certificate->Append(_("")); @@ -357,11 +357,11 @@ bool wxEAPCredentialsPromptTLSPanel::TransferDataToWindow() m_identity->SetValue(m_cred.m_identity); - return wxEAPCredentialsPromptPanel::TransferDataToWindow(); + return wxEAPCredentialsPromptPanel::TransferDataToWindow(); } -bool wxEAPCredentialsPromptTLSPanel::TransferDataFromWindow() +bool wxTLSCredentialsPanel::TransferDataFromWindow() { const wxCertificateClientData *data = dynamic_cast(m_certificate->GetClientObject(m_certificate->GetSelection())); if (data) @@ -373,11 +373,11 @@ bool wxEAPCredentialsPromptTLSPanel::TransferDataFromWindow() // Inherited TransferDataFromWindow() calls m_cred.store(). // Therefore, call it only now, that m_cred is set. - return wxEAPCredentialsPromptPanel::TransferDataFromWindow(); + return wxEAPCredentialsPromptPanel::TransferDataFromWindow(); } -void wxEAPCredentialsPromptTLSPanel::OnUpdateUI(wxUpdateUIEvent& /*event*/) +void wxTLSCredentialsPanel::OnUpdateUI(wxUpdateUIEvent& /*event*/) { if (!m_is_config && m_cfg.m_use_cred) { // Credential prompt mode & Using configured credentials diff --git a/lib/TTLS_UI/include/TTLS_UI.h b/lib/TTLS_UI/include/TTLS_UI.h index 7f84b10..641347d 100644 --- a/lib/TTLS_UI/include/TTLS_UI.h +++ b/lib/TTLS_UI/include/TTLS_UI.h @@ -137,7 +137,7 @@ protected: /// \endcond public: - wxEAPCredentialsPromptTLSPanel *m_outer_cred; ///< Outer credentials panel + wxTLSCredentialsPanel *m_outer_cred; ///< Outer credentials panel wxEAPCredentialsPanelBase *m_inner_cred; ///< Inner credentials panel protected: diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index cf16382..99f3bb6 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -265,7 +265,7 @@ wxTTLSCredentialsPanel::wxTTLSCredentialsPanel(const eap::config_provider &prov, if (eap::config_method_with_cred::status_cred_begin <= m_cfg.m_last_status && m_cfg.m_last_status < eap::config_method_with_cred::status_cred_end) sb_content->Add(new wxEAPCredentialWarningPanel(m_prov, m_cfg.m_last_status, this), 0, wxALL|wxEXPAND, 5); - m_outer_cred = new wxEAPCredentialsPromptTLSPanel(m_prov, m_cfg, cred, this, is_config); + m_outer_cred = new wxTLSCredentialsPanel(m_prov, m_cfg, cred, this, is_config); sb_content->Add(m_outer_cred, 0, wxALL|wxEXPAND, 5); this->SetSizer(sb_content);