Upgrade to wxWidgets 3.1.1 and wxFormBuilder 3.8.1
This commit is contained in:
parent
5fd1c3b60e
commit
7a6b760845
12
README.md
12
README.md
@ -58,22 +58,22 @@ Binaries are available for download [here](https://github.com/Amebis/GEANTLink/r
|
|||||||
- _MsiDb.Exe_ and other command line utilities for MSI packaging distributed as a part of Microsoft Windows SDK (installed with Visual Studio). Add SDK's `Bin` folder to the system path.
|
- _MsiDb.Exe_ and other command line utilities for MSI packaging distributed as a part of Microsoft Windows SDK (installed with Visual Studio). Add SDK's `Bin` folder to the system path.
|
||||||
|
|
||||||
### wxWidgets
|
### wxWidgets
|
||||||
GÉANTLink is using wxWidgets v3.0.2 static libraries. Unfortunately, only dynamic libraries (DLL) variant is available as a binary download. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets).
|
GÉANTLink is using wxWidgets v3.1.1 static libraries. Unfortunately, only dynamic libraries (DLL) variant is available as a binary download. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets).
|
||||||
|
|
||||||
#### Compiling wxWidgets Win32 static libraries
|
#### Compiling wxWidgets Win32 static libraries
|
||||||
1. Start _Visual Studio Command Prompt (2010)_
|
1. Start _Visual Studio Command Prompt (2010)_
|
||||||
2. Change working folder to `build\msw`
|
2. Change working folder to `build\msw`
|
||||||
3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0`
|
3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=100`
|
||||||
4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 BUILD=release`
|
4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=100 BUILD=release`
|
||||||
|
|
||||||
#### Compiling wxWidgets x64 static libraries
|
#### Compiling wxWidgets x64 static libraries
|
||||||
1. Start _Visual Studio x64 Cross Tools Command Prompt (2010)_
|
1. Start _Visual Studio x64 Cross Tools Command Prompt (2010)_
|
||||||
2. Change working folder to `build\msw`
|
2. Change working folder to `build\msw`
|
||||||
3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64`
|
3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=100 TARGET_CPU=X64`
|
||||||
4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64 BUILD=release`
|
4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=100 TARGET_CPU=X64 BUILD=release`
|
||||||
|
|
||||||
#### Specifying wxWidgets path
|
#### Specifying wxWidgets path
|
||||||
GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets\3.0.2`).
|
GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets\3.1.1`).
|
||||||
|
|
||||||
### Digital Signing of Build Outputs
|
### Digital Signing of Build Outputs
|
||||||
In order to have the build process digitally sign output files, one should provide the following:
|
In order to have the build process digitally sign output files, one should provide the following:
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;ISOLATION_AWARE_ENABLED=1;SECURITY_WIN32;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;EAP_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;ISOLATION_AWARE_ENABLED=1;SECURITY_WIN32;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;EAP_TLS=1;wxMSVC_VERSION=$(PlatformToolsetVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
|
||||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<LibraryPath>$(WXWIN)\lib\vc_lib;$(LibraryPath)</LibraryPath>
|
<LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_lib;$(LibraryPath)</LibraryPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<Lib>
|
<Lib>
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<LibraryPath>$(WXWIN)\lib\vc_x64_lib;$(LibraryPath)</LibraryPath>
|
<LibraryPath>$(WXWIN)\lib\vc$(PlatformToolsetVersion)_x64_lib;$(LibraryPath)</LibraryPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<Lib>
|
<Lib>
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,341 +1,339 @@
|
|||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// C++ code generated with wxFormBuilder (version Jun 17 2015)
|
// C++ code generated with wxFormBuilder (version Aug 8 2018)
|
||||||
// http://www.wxformbuilder.org/
|
// http://www.wxformbuilder.org/
|
||||||
//
|
//
|
||||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifndef __WXEAP_UI_H__
|
#ifndef __WXEAP_UI_H__
|
||||||
#define __WXEAP_UI_H__
|
#define __WXEAP_UI_H__
|
||||||
|
|
||||||
#include <wx/artprov.h>
|
#include <wx/artprov.h>
|
||||||
#include <wx/xrc/xmlres.h>
|
#include <wx/xrc/xmlres.h>
|
||||||
#include <wx/intl.h>
|
#include <wx/intl.h>
|
||||||
class wxEAPCredentialsPanelBase;
|
#include "../include/wxEAP_UIBase.h"
|
||||||
|
class wxEAPBannerPanel;
|
||||||
#include "../include/wxEAP_UIBase.h"
|
#include <wx/gdicmn.h>
|
||||||
class wxEAPBannerPanel;
|
#include <wx/font.h>
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/colour.h>
|
||||||
#include <wx/font.h>
|
#include <wx/settings.h>
|
||||||
#include <wx/colour.h>
|
#include <wx/string.h>
|
||||||
#include <wx/settings.h>
|
#include <wx/notebook.h>
|
||||||
#include <wx/string.h>
|
#include <wx/bitmap.h>
|
||||||
#include <wx/notebook.h>
|
#include <wx/image.h>
|
||||||
#include <wx/button.h>
|
#include <wx/icon.h>
|
||||||
#include <wx/sizer.h>
|
#include <wx/button.h>
|
||||||
#include <wx/dialog.h>
|
#include <wx/sizer.h>
|
||||||
#include <wx/stattext.h>
|
#include <wx/dialog.h>
|
||||||
#include <wx/panel.h>
|
#include <wx/stattext.h>
|
||||||
#include <wx/bitmap.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/image.h>
|
#include <wx/statbmp.h>
|
||||||
#include <wx/icon.h>
|
#include <wx/radiobut.h>
|
||||||
#include <wx/statbmp.h>
|
#include <wx/statbox.h>
|
||||||
#include <wx/radiobut.h>
|
#include <wx/timer.h>
|
||||||
#include <wx/statbox.h>
|
#include <wx/textctrl.h>
|
||||||
#include <wx/timer.h>
|
#include <wx/choice.h>
|
||||||
#include <wx/textctrl.h>
|
#include <wx/checkbox.h>
|
||||||
#include <wx/choice.h>
|
|
||||||
#include <wx/checkbox.h>
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxEAPConfigDialogBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxEAPConfigDialogBase
|
class wxEAPConfigDialogBase : public wxDialog
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxEAPConfigDialogBase : public wxDialog
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxEAPBannerPanel *m_banner;
|
||||||
protected:
|
wxNotebook* m_providers;
|
||||||
wxEAPBannerPanel *m_banner;
|
wxButton* m_prov_add;
|
||||||
wxNotebook* m_providers;
|
wxButton* m_prov_remove;
|
||||||
wxButton* m_prov_add;
|
wxButton* m_prov_advanced;
|
||||||
wxButton* m_prov_remove;
|
wxStdDialogButtonSizer* m_buttons;
|
||||||
wxButton* m_prov_advanced;
|
wxButton* m_buttonsOK;
|
||||||
wxStdDialogButtonSizer* m_buttons;
|
wxButton* m_buttonsCancel;
|
||||||
wxButton* m_buttonsOK;
|
|
||||||
wxButton* m_buttonsCancel;
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
|
||||||
// Virtual event handlers, overide them in your derived class
|
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
|
||||||
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
|
virtual void OnProvAdd( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
|
virtual void OnProvRemove( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnProvAdd( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnProvAdvanced( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnProvRemove( wxCommandEvent& event ) { event.Skip(); }
|
|
||||||
virtual void OnProvAdvanced( wxCommandEvent& event ) { event.Skip(); }
|
|
||||||
|
public:
|
||||||
|
|
||||||
public:
|
wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Connection Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||||
|
~wxEAPConfigDialogBase();
|
||||||
wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Connection Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
|
||||||
~wxEAPConfigDialogBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxEAPGeneralDialogBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxEAPGeneralDialogBase
|
class wxEAPGeneralDialogBase : public wxDialog
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxEAPGeneralDialogBase : public wxDialog
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxEAPBannerPanel *m_banner;
|
||||||
protected:
|
wxBoxSizer* m_panels;
|
||||||
wxEAPBannerPanel *m_banner;
|
wxStdDialogButtonSizer* m_buttons;
|
||||||
wxBoxSizer* m_panels;
|
wxButton* m_buttonsOK;
|
||||||
wxStdDialogButtonSizer* m_buttons;
|
wxButton* m_buttonsCancel;
|
||||||
wxButton* m_buttonsOK;
|
|
||||||
wxButton* m_buttonsCancel;
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
|
||||||
// Virtual event handlers, overide them in your derived class
|
|
||||||
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
|
|
||||||
|
public:
|
||||||
|
|
||||||
public:
|
wxEAPGeneralDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||||
|
~wxEAPGeneralDialogBase();
|
||||||
wxEAPGeneralDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
|
||||||
~wxEAPGeneralDialogBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxEAPCredentialsConnectionDialogBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxEAPCredentialsConnectionDialogBase
|
class wxEAPCredentialsConnectionDialogBase : public wxDialog
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxEAPCredentialsConnectionDialogBase : public wxDialog
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxEAPBannerPanel *m_banner;
|
||||||
protected:
|
wxStdDialogButtonSizer* m_buttons;
|
||||||
wxEAPBannerPanel *m_banner;
|
wxButton* m_buttonsOK;
|
||||||
wxStdDialogButtonSizer* m_buttons;
|
wxButton* m_buttonsCancel;
|
||||||
wxButton* m_buttonsOK;
|
|
||||||
wxButton* m_buttonsCancel;
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
|
||||||
// Virtual event handlers, overide them in your derived class
|
|
||||||
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
|
|
||||||
|
public:
|
||||||
|
wxNotebook* m_providers;
|
||||||
public:
|
|
||||||
wxNotebook* m_providers;
|
wxEAPCredentialsConnectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Credentials"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||||
|
~wxEAPCredentialsConnectionDialogBase();
|
||||||
wxEAPCredentialsConnectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Credentials"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
|
||||||
~wxEAPCredentialsConnectionDialogBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxEAPBannerPanelBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxEAPBannerPanelBase
|
class wxEAPBannerPanelBase : public wxPanel
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxEAPBannerPanelBase : public wxPanel
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
|
||||||
protected:
|
public:
|
||||||
|
wxStaticText* m_title;
|
||||||
public:
|
|
||||||
wxStaticText* m_title;
|
wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0, const wxString& name = wxEmptyString );
|
||||||
|
~wxEAPBannerPanelBase();
|
||||||
wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0 );
|
|
||||||
~wxEAPBannerPanelBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxEAPNotePanelBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxEAPNotePanelBase
|
class wxEAPNotePanelBase : public wxPanel
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxEAPNotePanelBase : public wxPanel
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxStaticBitmap* m_note_icon;
|
||||||
protected:
|
wxBoxSizer* m_note_vert;
|
||||||
wxStaticBitmap* m_note_icon;
|
wxStaticText* m_note_label;
|
||||||
wxBoxSizer* m_note_vert;
|
|
||||||
wxStaticText* m_note_label;
|
public:
|
||||||
|
|
||||||
public:
|
wxEAPNotePanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL|wxBORDER_SIMPLE, const wxString& name = wxEmptyString );
|
||||||
|
~wxEAPNotePanelBase();
|
||||||
wxEAPNotePanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
|
|
||||||
~wxEAPNotePanelBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxEAPCredentialsConfigPanelBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxEAPCredentialsConfigPanelBase
|
class wxEAPCredentialsConfigPanelBase : public wxPanel
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxEAPCredentialsConfigPanelBase : public wxPanel
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxStaticBoxSizer* m_sb_credentials;
|
||||||
protected:
|
wxStaticBitmap* m_credentials_icon;
|
||||||
wxStaticBoxSizer* m_sb_credentials;
|
wxStaticText* m_credentials_label;
|
||||||
wxStaticBitmap* m_credentials_icon;
|
wxRadioButton* m_storage;
|
||||||
wxStaticText* m_credentials_label;
|
wxStaticText* m_storage_identity_label;
|
||||||
wxRadioButton* m_storage;
|
wxStaticText* m_storage_identity;
|
||||||
wxStaticText* m_storage_identity_label;
|
wxButton* m_storage_clear;
|
||||||
wxStaticText* m_storage_identity;
|
wxButton* m_storage_set;
|
||||||
wxButton* m_storage_clear;
|
wxRadioButton* m_config;
|
||||||
wxButton* m_storage_set;
|
wxStaticText* m_config_identity_label;
|
||||||
wxRadioButton* m_config;
|
wxStaticText* m_config_identity;
|
||||||
wxStaticText* m_config_identity_label;
|
wxButton* m_config_set;
|
||||||
wxStaticText* m_config_identity;
|
wxTimer m_timer_storage;
|
||||||
wxButton* m_config_set;
|
|
||||||
wxTimer m_timer_storage;
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
|
||||||
// Virtual event handlers, overide them in your derived class
|
virtual void OnClearStorage( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
|
virtual void OnSetStorage( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnClearStorage( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnSetConfig( wxCommandEvent& event ) { event.Skip(); }
|
||||||
virtual void OnSetStorage( wxCommandEvent& event ) { event.Skip(); }
|
virtual void OnTimerStorage( wxTimerEvent& event ) { event.Skip(); }
|
||||||
virtual void OnSetConfig( wxCommandEvent& event ) { event.Skip(); }
|
|
||||||
virtual void OnTimerStorage( wxTimerEvent& event ) { event.Skip(); }
|
|
||||||
|
public:
|
||||||
|
|
||||||
public:
|
wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
|
||||||
|
~wxEAPCredentialsConfigPanelBase();
|
||||||
wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
|
|
||||||
~wxEAPCredentialsConfigPanelBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxPasswordCredentialsPanelBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxPasswordCredentialsPanelBase
|
class wxPasswordCredentialsPanelBase : public wxEAPCredentialsPanelBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxPasswordCredentialsPanelBase : public wxEAPCredentialsPanelBase
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxStaticBoxSizer* m_sb_credentials;
|
||||||
protected:
|
wxStaticBitmap* m_credentials_icon;
|
||||||
wxStaticBoxSizer* m_sb_credentials;
|
wxBoxSizer* m_sb_credentials_vert;
|
||||||
wxStaticBitmap* m_credentials_icon;
|
wxStaticText* m_credentials_label;
|
||||||
wxBoxSizer* m_sb_credentials_vert;
|
wxStaticText* m_identity_label;
|
||||||
wxStaticText* m_credentials_label;
|
wxTextCtrl* m_identity;
|
||||||
wxStaticText* m_identity_label;
|
wxStaticText* m_password_label;
|
||||||
wxTextCtrl* m_identity;
|
wxTextCtrl* m_password;
|
||||||
wxStaticText* m_password_label;
|
|
||||||
wxTextCtrl* m_password;
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnPasswordText( wxCommandEvent& event ) { event.Skip(); }
|
||||||
// Virtual event handlers, overide them in your derived class
|
|
||||||
virtual void OnPasswordText( wxCommandEvent& event ) { event.Skip(); }
|
|
||||||
|
public:
|
||||||
|
|
||||||
public:
|
wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
|
||||||
|
~wxPasswordCredentialsPanelBase();
|
||||||
wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
|
|
||||||
~wxPasswordCredentialsPanelBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxIdentityCredentialsPanelBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxIdentityCredentialsPanelBase
|
class wxIdentityCredentialsPanelBase : public wxEAPCredentialsPanelBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxIdentityCredentialsPanelBase : public wxEAPCredentialsPanelBase
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxStaticBoxSizer* m_sb_credentials;
|
||||||
protected:
|
wxStaticBitmap* m_credentials_icon;
|
||||||
wxStaticBoxSizer* m_sb_credentials;
|
wxBoxSizer* m_sb_credentials_vert;
|
||||||
wxStaticBitmap* m_credentials_icon;
|
wxStaticText* m_credentials_label;
|
||||||
wxBoxSizer* m_sb_credentials_vert;
|
wxStaticText* m_identity_label;
|
||||||
wxStaticText* m_credentials_label;
|
wxTextCtrl* m_identity;
|
||||||
wxStaticText* m_identity_label;
|
|
||||||
wxTextCtrl* m_identity;
|
public:
|
||||||
|
|
||||||
public:
|
wxIdentityCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
|
||||||
|
~wxIdentityCredentialsPanelBase();
|
||||||
wxIdentityCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
|
|
||||||
~wxIdentityCredentialsPanelBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxEAPProviderContactInfoPanelBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxEAPProviderContactInfoPanelBase
|
class wxEAPProviderContactInfoPanelBase : public wxPanel
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxEAPProviderContactInfoPanelBase : public wxPanel
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxStaticBitmap* m_provider_contact_icon;
|
||||||
protected:
|
wxStaticText* m_provider_contact_label;
|
||||||
wxStaticBitmap* m_provider_contact_icon;
|
wxStaticText* m_provider_name_label;
|
||||||
wxStaticText* m_provider_contact_label;
|
wxTextCtrl* m_provider_name;
|
||||||
wxStaticText* m_provider_name_label;
|
wxStaticText* m_provider_name_note;
|
||||||
wxTextCtrl* m_provider_name;
|
wxStaticText* m_provider_helpdesk_label;
|
||||||
wxStaticText* m_provider_name_note;
|
wxStaticText* m_provider_web_icon;
|
||||||
wxStaticText* m_provider_helpdesk_label;
|
wxTextCtrl* m_provider_web;
|
||||||
wxStaticText* m_provider_web_icon;
|
wxStaticText* m_provider_email_icon;
|
||||||
wxTextCtrl* m_provider_web;
|
wxTextCtrl* m_provider_email;
|
||||||
wxStaticText* m_provider_email_icon;
|
wxStaticText* m_provider_phone_icon;
|
||||||
wxTextCtrl* m_provider_email;
|
wxTextCtrl* m_provider_phone;
|
||||||
wxStaticText* m_provider_phone_icon;
|
|
||||||
wxTextCtrl* m_provider_phone;
|
public:
|
||||||
|
|
||||||
public:
|
wxEAPProviderContactInfoPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
|
||||||
|
~wxEAPProviderContactInfoPanelBase();
|
||||||
wxEAPProviderContactInfoPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
|
|
||||||
~wxEAPProviderContactInfoPanelBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxEAPProviderIDPanelBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxEAPProviderIDPanelBase
|
class wxEAPProviderIDPanelBase : public wxPanel
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxEAPProviderIDPanelBase : public wxPanel
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxStaticBitmap* m_provider_id_icon;
|
||||||
protected:
|
wxStaticText* m_provider_id_label_outer;
|
||||||
wxStaticBitmap* m_provider_id_icon;
|
wxStaticText* m_provider_namespace_label;
|
||||||
wxStaticText* m_provider_id_label_outer;
|
wxChoice* m_provider_namespace;
|
||||||
wxStaticText* m_provider_namespace_label;
|
wxStaticText* m_provider_id_label;
|
||||||
wxChoice* m_provider_namespace;
|
wxTextCtrl* m_provider_id;
|
||||||
wxStaticText* m_provider_id_label;
|
|
||||||
wxTextCtrl* m_provider_id;
|
public:
|
||||||
|
|
||||||
public:
|
wxEAPProviderIDPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
|
||||||
|
~wxEAPProviderIDPanelBase();
|
||||||
wxEAPProviderIDPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
|
|
||||||
~wxEAPProviderIDPanelBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxEAPProviderLockPanelBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxEAPProviderLockPanelBase
|
class wxEAPProviderLockPanelBase : public wxPanel
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxEAPProviderLockPanelBase : public wxPanel
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxStaticBitmap* m_provider_lock_icon;
|
||||||
protected:
|
wxStaticText* m_provider_lock_label;
|
||||||
wxStaticBitmap* m_provider_lock_icon;
|
wxCheckBox* m_provider_lock;
|
||||||
wxStaticText* m_provider_lock_label;
|
wxStaticText* m_provider_lock_note;
|
||||||
wxCheckBox* m_provider_lock;
|
|
||||||
wxStaticText* m_provider_lock_note;
|
public:
|
||||||
|
|
||||||
public:
|
wxEAPProviderLockPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
|
||||||
|
~wxEAPProviderLockPanelBase();
|
||||||
wxEAPProviderLockPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
|
|
||||||
~wxEAPProviderLockPanelBase();
|
};
|
||||||
|
|
||||||
};
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class wxEAPProviderSelectDialogBase
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
/// Class wxEAPProviderSelectDialogBase
|
class wxEAPProviderSelectDialogBase : public wxDialog
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
{
|
||||||
class wxEAPProviderSelectDialogBase : public wxDialog
|
private:
|
||||||
{
|
|
||||||
private:
|
protected:
|
||||||
|
wxEAPBannerPanel *m_banner;
|
||||||
protected:
|
wxBoxSizer* m_providers;
|
||||||
wxEAPBannerPanel *m_banner;
|
wxStdDialogButtonSizer* m_buttons;
|
||||||
wxBoxSizer* m_providers;
|
wxButton* m_buttonsCancel;
|
||||||
wxStdDialogButtonSizer* m_buttons;
|
|
||||||
wxButton* m_buttonsCancel;
|
// Virtual event handlers, overide them in your derived class
|
||||||
|
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
|
||||||
// Virtual event handlers, overide them in your derived class
|
|
||||||
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
|
|
||||||
|
public:
|
||||||
|
|
||||||
public:
|
wxEAPProviderSelectDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Identity Provider"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
||||||
|
~wxEAPProviderSelectDialogBase();
|
||||||
wxEAPProviderSelectDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Identity Provider"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
|
|
||||||
~wxEAPProviderSelectDialogBase();
|
};
|
||||||
|
|
||||||
};
|
#endif //__WXEAP_UI_H__
|
||||||
|
|
||||||
#endif //__WXEAP_UI_H__
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user