diff --git a/lib/TLS_UI/res/wxTLS_UI.cpp b/lib/TLS_UI/res/wxTLS_UI.cpp index 45f8a60..dbb7605 100644 --- a/lib/TLS_UI/res/wxTLS_UI.cpp +++ b/lib/TLS_UI/res/wxTLS_UI.cpp @@ -147,11 +147,7 @@ wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindow m_identity = new wxTextCtrl( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_identity->SetToolTip( _("Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate") ); - sb_identity->Add( m_identity, 0, wxEXPAND|wxBOTTOM, 5 ); - - m_identity_note = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("(Example: user@contoso.com)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_identity_note->Wrap( -1 ); - sb_identity->Add( m_identity_note, 0, wxALIGN_RIGHT, 5 ); + sb_identity->Add( m_identity, 0, wxEXPAND, 5 ); m_sb_credentials_vert->Add( sb_identity, 0, wxEXPAND|wxALL, 5 ); diff --git a/lib/TLS_UI/res/wxTLS_UI.fbp b/lib/TLS_UI/res/wxTLS_UI.fbp index 1dd3e0a..b7931e2 100644 --- a/lib/TLS_UI/res/wxTLS_UI.fbp +++ b/lib/TLS_UI/res/wxTLS_UI.fbp @@ -1423,7 +1423,7 @@ 5 - wxEXPAND|wxBOTTOM + wxEXPAND 0 1 @@ -1512,89 +1512,6 @@ - - 5 - wxALIGN_RIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - (Example: user@contoso.com) - - 0 - - - 0 - - 1 - m_identity_note - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/TLS_UI/res/wxTLS_UI.h b/lib/TLS_UI/res/wxTLS_UI.h index 5732cdb..6d91848 100644 --- a/lib/TLS_UI/res/wxTLS_UI.h +++ b/lib/TLS_UI/res/wxTLS_UI.h @@ -83,7 +83,6 @@ class wxTLSCredentialsPanelBase : public wxEAPCredentialsPanelBase wxChoice* m_certificate; wxStaticText* m_identity_label; wxTextCtrl* m_identity; - wxStaticText* m_identity_note; // Virtual event handlers, overide them in your derived class virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }