From c6c72bf9f2550f33239868fbb9103e90c392b6e1 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 21 Sep 2016 10:05:52 +0200 Subject: [PATCH] wxEAPCredentialsPromptTLSPanelBase is derived from wxEAPCredentialsPanelBase now --- lib/TLS_UI/res/wxTLS_UI.cpp | 2 +- lib/TLS_UI/res/wxTLS_UI.fbp | 2 +- lib/TLS_UI/res/wxTLS_UI.h | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/TLS_UI/res/wxTLS_UI.cpp b/lib/TLS_UI/res/wxTLS_UI.cpp index fb4d09a..2c7c0f1 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 ) : wxPanel( parent, id, pos, size, style ) +wxEAPCredentialsPromptTLSPanelBase::wxEAPCredentialsPromptTLSPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxEAPCredentialsPanelBase( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_credentials; sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("TLS Client Certificate") ), wxVERTICAL ); diff --git a/lib/TLS_UI/res/wxTLS_UI.fbp b/lib/TLS_UI/res/wxTLS_UI.fbp index 263c60f..3f845b0 100644 --- a/lib/TLS_UI/res/wxTLS_UI.fbp +++ b/lib/TLS_UI/res/wxTLS_UI.fbp @@ -1016,7 +1016,7 @@ wxEAPCredentialsPromptTLSPanelBase 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 5c3113e..c1a1112 100644 --- a/lib/TLS_UI/res/wxTLS_UI.h +++ b/lib/TLS_UI/res/wxTLS_UI.h @@ -11,6 +11,9 @@ #include #include #include +class wxEAPCredentialsPanelBase; + +#include "../../EAPBase_UI/include/wxEAP_UIBase.h" #include #include #include @@ -70,7 +73,7 @@ class wxEAPTLSServerTrustConfigPanelBase : public wxPanel /////////////////////////////////////////////////////////////////////////////// /// Class wxEAPCredentialsPromptTLSPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPCredentialsPromptTLSPanelBase : public wxPanel +class wxEAPCredentialsPromptTLSPanelBase : public wxEAPCredentialsPanelBase { private: