From a81ddde411b1d946335a8b086453439a53e4d432 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 3 Aug 2016 09:22:41 +0200 Subject: [PATCH] MSVC specific __super keyword replaced --- lib/EAPBase_UI/src/EAP_UI.cpp | 4 ++-- lib/TLS_UI/src/TLS_UI.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/EAPBase_UI/src/EAP_UI.cpp b/lib/EAPBase_UI/src/EAP_UI.cpp index ca8bc10..c679262 100644 --- a/lib/EAPBase_UI/src/EAP_UI.cpp +++ b/lib/EAPBase_UI/src/EAP_UI.cpp @@ -189,7 +189,7 @@ bool wxPasswordCredentialsPanel::TransferDataToWindow() { // Inherited TransferDataToWindow() calls m_cred.retrieve(). // Therefore, call it now, to set m_cred. - wxCHECK(__super::TransferDataToWindow(), false); + wxCHECK(wxEAPCredentialsPanelBase::TransferDataToWindow(), false); m_identity->SetValue(m_cred.m_identity); m_identity->SetSelection(0, -1); @@ -211,7 +211,7 @@ bool wxPasswordCredentialsPanel::TransferDataFromWindow() // Inherited TransferDataFromWindow() calls m_cred.store(). // Therefore, call it only now, that m_cred is set. - return __super::TransferDataFromWindow(); + return wxEAPCredentialsPanelBase::TransferDataFromWindow(); } diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp index 00b8c89..710c892 100644 --- a/lib/TLS_UI/src/TLS_UI.cpp +++ b/lib/TLS_UI/src/TLS_UI.cpp @@ -361,7 +361,7 @@ bool wxTLSCredentialsPanel::TransferDataToWindow() m_cert_select_val->SetSelection(0); } - return __super::TransferDataToWindow(); + return wxEAPCredentialsPanelBase::TransferDataToWindow(); } @@ -379,7 +379,7 @@ bool wxTLSCredentialsPanel::TransferDataFromWindow() // Inherited TransferDataFromWindow() calls m_cred.store(). // Therefore, call it only now, that m_cred is set. - return __super::TransferDataFromWindow(); + return wxEAPCredentialsPanelBase::TransferDataFromWindow(); }