Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

MSVC specific __super keyword replaced

Browse Source
This commit is contained in:
Simon Rozman 2016-08-03 09:22:41 +02:00
parent aafd012809
commit a81ddde411
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/EAPBase_UI/src/EAP_UI.cpp
View File

@ -189,7 +189,7 @@ bool wxPasswordCredentialsPanel::TransferDataToWindow()
{ {
// Inherited TransferDataToWindow() calls m_cred.retrieve(). // Inherited TransferDataToWindow() calls m_cred.retrieve().
// Therefore, call it now, to set m_cred. // Therefore, call it now, to set m_cred.
wxCHECK(__super::TransferDataToWindow(), false); wxCHECK(wxEAPCredentialsPanelBase<wxEAPCredentialsPanelPassBase>::TransferDataToWindow(), false);
m_identity->SetValue(m_cred.m_identity); m_identity->SetValue(m_cred.m_identity);
m_identity->SetSelection(0, -1); m_identity->SetSelection(0, -1);
@ -211,7 +211,7 @@ bool wxPasswordCredentialsPanel::TransferDataFromWindow()
// Inherited TransferDataFromWindow() calls m_cred.store(). // Inherited TransferDataFromWindow() calls m_cred.store().
// Therefore, call it only now, that m_cred is set. // Therefore, call it only now, that m_cred is set.
return __super::TransferDataFromWindow(); return wxEAPCredentialsPanelBase<wxEAPCredentialsPanelPassBase>::TransferDataFromWindow();
} }

4
lib/TLS_UI/src/TLS_UI.cpp
View File

@ -361,7 +361,7 @@ bool wxTLSCredentialsPanel::TransferDataToWindow()
m_cert_select_val->SetSelection(0); m_cert_select_val->SetSelection(0);
} }
return __super::TransferDataToWindow(); return wxEAPCredentialsPanelBase<wxTLSCredentialsPanelBase>::TransferDataToWindow();
} }
@ -379,7 +379,7 @@ bool wxTLSCredentialsPanel::TransferDataFromWindow()
// Inherited TransferDataFromWindow() calls m_cred.store(). // Inherited TransferDataFromWindow() calls m_cred.store().
// Therefore, call it only now, that m_cred is set. // Therefore, call it only now, that m_cred is set.
return __super::TransferDataFromWindow(); return wxEAPCredentialsPanelBase<wxTLSCredentialsPanelBase>::TransferDataFromWindow();
} }