From ce22ec3bfa444984d461eab13f797aa39156982b Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 17 Aug 2016 13:48:14 +0200 Subject: [PATCH] wxEAPCredentialsPanelPassBase >> wxEAPCredentialsPassPanelBase --- lib/EAPBase_UI/include/EAP_UI.h | 6 +++--- lib/EAPBase_UI/res/wxEAP_UI.cpp | 4 ++-- lib/EAPBase_UI/res/wxEAP_UI.fbp | 2 +- lib/EAPBase_UI/res/wxEAP_UI.h | 8 ++++---- lib/PAP_UI/include/PAP_UI.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index 809aa48..c12ca0f 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -581,12 +581,12 @@ protected: m_identity->SetSelection(0, -1); m_password->SetValue(m_cred.m_password.empty() ? wxEmptyString : s_dummy_password); - return wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::TransferDataToWindow(); + return wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPassPanelBase>::TransferDataToWindow(); } virtual bool TransferDataFromWindow() { - if (!wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::TransferDataFromWindow()) + if (!wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPassPanelBase>::TransferDataFromWindow()) return false; m_cred.m_identity = m_identity->GetValue(); @@ -609,7 +609,7 @@ protected: m_password ->Enable(false); } - wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPanelPassBase>::OnUpdateUI(event); + wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPassPanelBase>::OnUpdateUI(event); } /// \endcond diff --git a/lib/EAPBase_UI/res/wxEAP_UI.cpp b/lib/EAPBase_UI/res/wxEAP_UI.cpp index dca6cbf..049cfe7 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.cpp +++ b/lib/EAPBase_UI/res/wxEAP_UI.cpp @@ -269,7 +269,7 @@ wxEAPCredentialsConfigPanelBase::~wxEAPCredentialsConfigPanelBase() } -wxEAPCredentialsPanelPassBase::wxEAPCredentialsPanelPassBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +wxEAPCredentialsPassPanelBase::wxEAPCredentialsPassPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_credentials; sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL ); @@ -330,6 +330,6 @@ wxEAPCredentialsPanelPassBase::wxEAPCredentialsPanelPassBase( wxWindow* parent, this->Layout(); } -wxEAPCredentialsPanelPassBase::~wxEAPCredentialsPanelPassBase() +wxEAPCredentialsPassPanelBase::~wxEAPCredentialsPassPanelBase() { } diff --git a/lib/EAPBase_UI/res/wxEAP_UI.fbp b/lib/EAPBase_UI/res/wxEAP_UI.fbp index b1986ed..2e1ffcd 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.fbp +++ b/lib/EAPBase_UI/res/wxEAP_UI.fbp @@ -1818,7 +1818,7 @@ wxID_ANY - wxEAPCredentialsPanelPassBase + wxEAPCredentialsPassPanelBase 500,-1 diff --git a/lib/EAPBase_UI/res/wxEAP_UI.h b/lib/EAPBase_UI/res/wxEAP_UI.h index 64a1027..c1599d6 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.h +++ b/lib/EAPBase_UI/res/wxEAP_UI.h @@ -153,9 +153,9 @@ class wxEAPCredentialsConfigPanelBase : public wxPanel }; /////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPCredentialsPanelPassBase +/// Class wxEAPCredentialsPassPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPCredentialsPanelPassBase : public wxPanel +class wxEAPCredentialsPassPanelBase : public wxPanel { private: @@ -170,8 +170,8 @@ class wxEAPCredentialsPanelPassBase : public wxPanel public: - wxEAPCredentialsPanelPassBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxEAPCredentialsPanelPassBase(); + wxEAPCredentialsPassPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxEAPCredentialsPassPanelBase(); }; diff --git a/lib/PAP_UI/include/PAP_UI.h b/lib/PAP_UI/include/PAP_UI.h index 8d25707..374f8cc 100644 --- a/lib/PAP_UI/include/PAP_UI.h +++ b/lib/PAP_UI/include/PAP_UI.h @@ -25,7 +25,7 @@ /// /// PAP credential configuration panel /// -typedef wxEAPCredentialsConfigPanel > wxPAPCredentialsConfigPanel; +typedef wxEAPCredentialsConfigPanel > wxPAPCredentialsConfigPanel; /// /// PAP configuration panel @@ -35,7 +35,7 @@ class wxPAPConfigPanel; /// /// PAP credential entry panel /// -typedef wxPasswordCredentialsPanel wxPAPCredentialsPanel; +typedef wxPasswordCredentialsPanel wxPAPCredentialsPanel; #pragma once