From: Steve Brokenshire Date: Sun, 13 Nov 2016 12:55:20 +0000 (+0000) Subject: Updated AppXestiaAddrBk.cpp X-Git-Tag: release-0.16~9 X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=689cf049e57ec38bd4d901c30f25e21b73cc0022;p=xestiaab%2F.git Updated AppXestiaAddrBk.cpp --- diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp index f66b81c..d5ddf8f 100644 --- a/source/AppXestiaAddrBk.cpp +++ b/source/AppXestiaAddrBk.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 24 2016) +// C++ code generated with wxFormBuilder (version Nov 13 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -57,7 +57,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, mnuContact = new wxMenu(); wxMenuItem* mnuNewContact; - mnuNewContact = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("New Contact...") ) + wxT('\t') + wxT("CTRL+N"), wxEmptyString, wxITEM_NORMAL ); + mnuNewContact = new wxMenuItem( mnuContact, ID_CONTACT_ADD, wxString( wxT("New Contact...") ) + wxT('\t') + wxT("CTRL+N"), wxEmptyString, wxITEM_NORMAL ); mnuContact->Append( mnuNewContact ); wxMenuItem* mnuEditContact; @@ -71,7 +71,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, mnuContact->AppendSeparator(); wxMenuItem* mnuFindContact; - mnuFindContact = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Find Contacts...") ) + wxT('\t') + wxT("CTRL+F"), wxEmptyString, wxITEM_NORMAL ); + mnuFindContact = new wxMenuItem( mnuContact, ID_CONTACT_FIND, wxString( wxT("Find Contacts...") ) + wxT('\t') + wxT("CTRL+F"), wxEmptyString, wxITEM_NORMAL ); mnuContact->Append( mnuFindContact ); mnuMain->Append( mnuContact, wxT("Contact") ); @@ -210,6 +210,27 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, this->SetSizer( szrMain ); this->Layout(); stbBottom = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY ); + tblMain = this->CreateToolBar( wxTB_HORIZONTAL, wxID_ANY ); + tbtNewAccount = tblMain->AddTool( ID_MANAGE_NEWAB, wxT("New Address Book"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("New Address Book"), wxT("Setup a new local or remote address book"), NULL ); + + tblMain->AddSeparator(); + + tbtPreferences = tblMain->AddTool( wxID_PREFERENCES, wxT("Preferences"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Preferences"), wxT("View or change application settings"), NULL ); + + tblMain->AddSeparator(); + + tbtSearch = tblMain->AddTool( ID_CONTACT_FIND, wxT("Search Contacts"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Search Contacts"), wxT("Search for contacts in address books"), NULL ); + + tblMain->AddSeparator(); + + tbtAddContact = tblMain->AddTool( ID_CONTACT_ADD, wxT("Add Contact"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Add Contact"), wxT("Add a new contact"), NULL ); + + tbtEditContact = tblMain->AddTool( ID_CONTACT_EDIT, wxT("Edit Contact"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Edit Contact"), wxT("Edit a contact"), NULL ); + + tbtDeleteContact = tblMain->AddTool( ID_CONTACT_DELETE, wxT("Delete Contact"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Delete Contact"), wxT("Delete a contact"), NULL ); + + tblMain->Realize(); + this->Centre( wxBOTH ); @@ -257,10 +278,10 @@ frmMainADT::~frmMainADT() this->Disconnect( ID_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) ); this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenPreferences ) ); this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) ); + this->Disconnect( ID_CONTACT_ADD, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) ); this->Disconnect( ID_CONTACT_EDIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorEdit ) ); this->Disconnect( ID_CONTACT_DELETE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::DeleteContact ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenFindContactsWindow ) ); + this->Disconnect( ID_CONTACT_FIND, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenFindContactsWindow ) ); this->Disconnect( ID_VIEW_FNLN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortFNLN ) ); this->Disconnect( ID_VIEW_LNFN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortLNFN ) ); this->Disconnect( ID_VIEW_NICK, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortNickname ) ); @@ -306,6 +327,8 @@ frmUpdateADT::frmUpdateADT( wxWindow* parent, wxWindowID id, const wxString& tit lblRunningVer = new wxStaticText( pnlUpdateData, wxID_ANY, wxT("UPDATEVER"), wxDefaultPosition, wxDefaultSize, 0 ); lblRunningVer->Wrap( -1 ); + lblRunningVer->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + fgSizer45->Add( lblRunningVer, 0, wxALL, 5 ); lblAvailableText = new wxStaticText( pnlUpdateData, wxID_ANY, wxT("Available version is:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -705,7 +728,7 @@ frmAboutADT::frmAboutADT( wxWindow* parent, wxWindowID id, const wxString& title lblVersion = new wxStaticText( this, wxID_ANY, wxT("Version 0.00"), wxDefaultPosition, wxDefaultSize, 0 ); lblVersion->Wrap( -1 ); - lblVersion->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) ); + lblVersion->SetFont( wxFont( 14, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); szrDetails->Add( lblVersion, 0, wxALL, 5 ); @@ -832,7 +855,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr fgSizer33->Add( lblServerAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtServerAddress = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtServerAddress->SetMaxLength( 0 ); fgSizer33->Add( txtServerAddress, 1, wxALL|wxEXPAND, 5 ); lblServerPort = new wxStaticText( tabType, wxID_ANY, wxT("Server Port:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -840,7 +862,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr fgSizer33->Add( lblServerPort, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtServerPort = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtServerPort->SetMaxLength( 0 ); fgSizer33->Add( txtServerPort, 0, wxALL, 5 ); lblUsername = new wxStaticText( tabType, wxID_ANY, wxT("Username:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -848,7 +869,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr fgSizer33->Add( lblUsername, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtUsername = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtUsername->SetMaxLength( 0 ); fgSizer33->Add( txtUsername, 1, wxALL|wxEXPAND, 5 ); lblPassword = new wxStaticText( tabType, wxID_ANY, wxT("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -856,7 +876,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr fgSizer33->Add( lblPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtPassword = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - txtPassword->SetMaxLength( 0 ); fgSizer33->Add( txtPassword, 0, wxALL|wxEXPAND, 5 ); lblSSL = new wxStaticText( tabType, wxID_ANY, wxT("SSL:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -890,7 +909,7 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr lblConnectionResult = new wxStaticText( tabConn, wxID_ANY, wxT("Connection Results:"), wxDefaultPosition, wxDefaultSize, 0 ); lblConnectionResult->Wrap( -1 ); - lblConnectionResult->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Sans") ) ); + lblConnectionResult->SetFont( wxFont( 9, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxT("Sans") ) ); bSizer323->Add( lblConnectionResult, 0, wxALL, 5 ); @@ -986,7 +1005,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr fgSizer341->Add( lblAccountName, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtAccountName = new wxTextCtrl( tabFinish, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAccountName->SetMaxLength( 0 ); fgSizer341->Add( txtAccountName, 1, wxALL|wxEXPAND, 5 ); @@ -1064,7 +1082,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const gSizer7->Add( lblTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTitle = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTitle->SetMaxLength( 0 ); gSizer7->Add( txtTitle, 0, wxALL|wxEXPAND, 5 ); @@ -1084,7 +1101,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const gSizer7->Add( lblForename, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtForename = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtForename->SetMaxLength( 0 ); gSizer7->Add( txtForename, 0, wxALL|wxEXPAND, 5 ); lblSurname = new wxStaticText( tabGeneral, wxID_ANY, wxT("Surname:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1092,7 +1108,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const gSizer7->Add( lblSurname, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtSurname = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtSurname->SetMaxLength( 0 ); gSizer7->Add( txtSurname, 0, wxALL|wxEXPAND, 5 ); lblOtherNames = new wxStaticText( tabGeneral, wxID_ANY, wxT("Other Names:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1100,7 +1115,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const gSizer7->Add( lblOtherNames, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtOtherNames = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtOtherNames->SetMaxLength( 0 ); gSizer7->Add( txtOtherNames, 0, wxALL|wxEXPAND, 5 ); lblSuffix = new wxStaticText( tabGeneral, wxID_ANY, wxT("Suffix:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1108,7 +1122,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const gSizer7->Add( lblSuffix, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtSuffix = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtSuffix->SetMaxLength( 0 ); gSizer7->Add( txtSuffix, 0, wxALL|wxEXPAND, 5 ); @@ -1141,14 +1154,13 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const bSizer318 = new wxBoxSizer( wxHORIZONTAL ); dapBirthday = new wxDatePickerCtrl( tabGeneral, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_ALLOWNONE|wxDP_DEFAULT|wxDP_DROPDOWN|wxDP_SHOWCENTURY ); - dapBirthday->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); + dapBirthday->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); dapBirthday->SetToolTip( wxT("If you don't wish to enter a year, please use '0000' as the year.") ); dapBirthday->SetMinSize( wxSize( -1,25 ) ); bSizer318->Add( dapBirthday, 0, wxALL|wxEXPAND, 5 ); txtBirthday = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtBirthday->SetMaxLength( 0 ); bSizer318->Add( txtBirthday, 1, wxALL, 5 ); @@ -1168,7 +1180,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const bSizer319->Add( dapAnniversary, 0, wxALL|wxEXPAND, 5 ); txtAnniversary = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAnniversary->SetMaxLength( 0 ); bSizer319->Add( txtAnniversary, 1, wxALL, 5 ); @@ -1188,7 +1199,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const bSizer20->Add( cmbGender, 0, wxALL, 5 ); txtGenderDescription = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtGenderDescription->SetMaxLength( 0 ); bSizer20->Add( txtGenderDescription, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -3795,7 +3805,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer6->Add( lblAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtAddress = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAddress->SetMaxLength( 0 ); fgSizer6->Add( txtAddress, 0, wxALL|wxEXPAND, 5 ); m_staticText61 = new wxStaticText( tabGeneral, wxID_ANY, wxT("Town/City:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3803,7 +3812,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer6->Add( m_staticText61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTownCity = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTownCity->SetMaxLength( 0 ); fgSizer6->Add( txtTownCity, 0, wxALL|wxEXPAND, 5 ); lblCountyState = new wxStaticText( tabGeneral, wxID_ANY, wxT("County:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3811,7 +3819,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer6->Add( lblCountyState, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtCounty = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtCounty->SetMaxLength( 0 ); fgSizer6->Add( txtCounty, 0, wxALL|wxEXPAND, 5 ); lblPostCode = new wxStaticText( tabGeneral, wxID_ANY, wxT("Post Code:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3819,7 +3826,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer6->Add( lblPostCode, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtPostCode = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtPostCode->SetMaxLength( 0 ); fgSizer6->Add( txtPostCode, 0, wxALL, 5 ); lblCountry = new wxStaticText( tabGeneral, wxID_ANY, wxT("Country:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3827,7 +3833,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer6->Add( lblCountry, 0, wxALL, 5 ); txtCountry = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtCountry->SetMaxLength( 0 ); fgSizer6->Add( txtCountry, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3917,7 +3922,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer61->Add( lblGeography, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtGeo = new wxTextCtrl( tabOther, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtGeo->SetMaxLength( 0 ); fgSizer61->Add( txtGeo, 0, wxALL|wxEXPAND, 5 ); lblTimezone = new wxStaticText( tabOther, wxID_ANY, wxT("Timezone:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3925,7 +3929,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer61->Add( lblTimezone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTimezone = new wxTextCtrl( tabOther, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTimezone->SetMaxLength( 0 ); fgSizer61->Add( txtTimezone, 0, wxALL|wxEXPAND, 5 ); @@ -4072,7 +4075,7 @@ frmConflictResolutionADT::~frmConflictResolutionADT() frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style ) { - this->SetSizeHints( wxSize( 400,300 ), wxDefaultSize ); + this->SetSizeHints( wxSize( 400,425 ), wxDefaultSize ); mnuMenuBar = new wxMenuBar( 0 ); mnuWindow = new wxMenu(); @@ -4214,7 +4217,6 @@ frmContactEditorNicknameADT::frmContactEditorNicknameADT( wxWindow* parent, wxWi fgSizer6->Add( lblNickname, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtNickname = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtNickname->SetMaxLength( 0 ); fgSizer6->Add( txtNickname, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -4415,7 +4417,6 @@ frmContactEditorRolesADT::frmContactEditorRolesADT( wxWindow* parent, wxWindowID fgSizer6->Add( lblRole, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtRole = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtRole->SetMaxLength( 0 ); fgSizer6->Add( txtRole, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -4527,7 +4528,6 @@ frmContactEditorOrganisationsADT::frmContactEditorOrganisationsADT( wxWindow* pa fgSizer6->Add( lblOrganisation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtOrganisation = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtOrganisation->SetMaxLength( 0 ); fgSizer6->Add( txtOrganisation, 0, wxALL|wxEXPAND, 5 ); lblSortAs = new wxStaticText( tabGeneral, wxID_ANY, wxT("Sort As:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -4783,7 +4783,6 @@ frmContactEditorTitlesADT::frmContactEditorTitlesADT( wxWindow* parent, wxWindow fgSizer6->Add( lblTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTitle = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTitle->SetMaxLength( 0 ); fgSizer6->Add( txtTitle, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -4895,7 +4894,6 @@ frmContactEditorRelatedADT::frmContactEditorRelatedADT( wxWindow* parent, wxWind fgSizer6->Add( lblRelation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtRelated = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtRelated->SetMaxLength( 0 ); fgSizer6->Add( txtRelated, 0, wxALL|wxEXPAND, 5 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5254,7 +5252,6 @@ frmContactEditorWebsitesADT::frmContactEditorWebsitesADT( wxWindow* parent, wxWi fgSizer6->Add( lblWebsite, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtWebsite = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtWebsite->SetMaxLength( 0 ); fgSizer6->Add( txtWebsite, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5366,7 +5363,6 @@ frmContactEditorGeopositionADT::frmContactEditorGeopositionADT( wxWindow* parent fgSizer6->Add( lblGeoposition, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtGeoposition = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtGeoposition->SetMaxLength( 0 ); fgSizer6->Add( txtGeoposition, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5478,7 +5474,6 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow fgSizer6->Add( lblAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtAddress = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAddress->SetMaxLength( 0 ); fgSizer6->Add( txtAddress, 0, wxALL|wxEXPAND, 5 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5599,7 +5594,6 @@ frmContactEditorVendorADT::frmContactEditorVendorADT( wxWindow* parent, wxWindow fgSizer6->Add( lblVendorPEN, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtPEN = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtPEN->SetMaxLength( 0 ); fgSizer6->Add( txtPEN, 0, wxALL, 5 ); lblElement = new wxStaticText( tabGeneral, wxID_ANY, wxT("Element:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5607,7 +5601,6 @@ frmContactEditorVendorADT::frmContactEditorVendorADT( wxWindow* parent, wxWindow fgSizer6->Add( lblElement, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtElement = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtElement->SetMaxLength( 0 ); fgSizer6->Add( txtElement, 0, wxALL|wxEXPAND, 5 ); lblValue = new wxStaticText( tabGeneral, wxID_ANY, wxT("Value:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5615,7 +5608,6 @@ frmContactEditorVendorADT::frmContactEditorVendorADT( wxWindow* parent, wxWindow fgSizer6->Add( lblValue, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtValue = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtValue->SetMaxLength( 0 ); fgSizer6->Add( txtValue, 0, wxALL|wxEXPAND, 5 ); @@ -5677,7 +5669,6 @@ frmContactEditorXTokenADT::frmContactEditorXTokenADT( wxWindow* parent, wxWindow fgSizer6->Add( lblTokenName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTokenName = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTokenName->SetMaxLength( 0 ); fgSizer6->Add( txtTokenName, 0, wxALL, 5 ); lblXT = new wxStaticText( tabGeneral, wxID_ANY, wxT("Value:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5685,7 +5676,6 @@ frmContactEditorXTokenADT::frmContactEditorXTokenADT( wxWindow* parent, wxWindow fgSizer6->Add( lblXT, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtValue = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtValue->SetMaxLength( 0 ); fgSizer6->Add( txtValue, 0, wxALL|wxEXPAND, 5 ); @@ -5832,7 +5822,6 @@ frmContactEditorKeyADT::frmContactEditorKeyADT( wxWindow* parent, wxWindowID id, fgSizer61->Add( lblAddress, 0, wxALL, 5 ); txtAddress = new wxTextCtrl( tabURL, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAddress->SetMaxLength( 0 ); fgSizer61->Add( txtAddress, 1, wxALL|wxEXPAND, 5 ); @@ -5932,7 +5921,6 @@ frmContactEditorEmailADT::frmContactEditorEmailADT( wxWindow* parent, wxWindowID fgSizer6->Add( lblEmailAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtEmail = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtEmail->SetMaxLength( 0 ); fgSizer6->Add( txtEmail, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6051,7 +6039,6 @@ frmContactEditorIMADT::frmContactEditorIMADT( wxWindow* parent, wxWindowID id, c fgSizer6->Add( lblUsername, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtUsername = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtUsername->SetMaxLength( 0 ); fgSizer6->Add( txtUsername, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6163,7 +6150,6 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi fgSizer6->Add( lblCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtCategory = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtCategory->SetMaxLength( 0 ); fgSizer6->Add( txtCategory, 0, wxALL|wxEXPAND, 5 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6284,7 +6270,6 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx fgSizer6->Add( lblTelephone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTelephone = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTelephone->SetMaxLength( 0 ); fgSizer6->Add( txtTelephone, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6424,7 +6409,6 @@ frmContactEditorLanguagesADT::frmContactEditorLanguagesADT( wxWindow* parent, wx fgSizer6->Add( lblLanguage, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtLanguage = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtLanguage->SetMaxLength( 0 ); fgSizer6->Add( txtLanguage, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6649,7 +6633,6 @@ XABSearchPanelADT::XABSearchPanelADT( wxWindow* parent, wxWindowID id, const wxP szrSSet->Add( chkActive, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtSearch = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtSearch->SetMaxLength( 0 ); szrSSet->Add( txtSearch, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -6763,7 +6746,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer43->Add( lblAccName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtAccountName = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAccountName->SetMaxLength( 0 ); fgSizer43->Add( txtAccountName, 1, wxALL|wxEXPAND, 5 ); lblAccAdr = new wxStaticText( tabProperties, wxID_ANY, wxT("Address:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6771,7 +6753,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer43->Add( lblAccAdr, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtAddress = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAddress->SetMaxLength( 0 ); fgSizer43->Add( txtAddress, 0, wxALL|wxEXPAND, 5 ); m_staticText193 = new wxStaticText( tabProperties, wxID_ANY, wxT("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6779,7 +6760,14 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer43->Add( m_staticText193, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtPort = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtPort->SetMaxLength( 5 ); + #ifdef __WXGTK__ + if ( !txtPort->HasFlag( wxTE_MULTILINE ) ) + { + txtPort->SetMaxLength( 5 ); + } + #else + txtPort->SetMaxLength( 5 ); + #endif fgSizer43->Add( txtPort, 0, wxALL, 5 ); lblPort = new wxStaticText( tabProperties, wxID_ANY, wxT("Username:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6787,7 +6775,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer43->Add( lblPort, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtUsername = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtUsername->SetMaxLength( 0 ); fgSizer43->Add( txtUsername, 0, wxALL|wxEXPAND, 5 ); lblPassword = new wxStaticText( tabProperties, wxID_ANY, wxT("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6795,7 +6782,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer43->Add( lblPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtPassword = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - txtPassword->SetMaxLength( 0 ); fgSizer43->Add( txtPassword, 0, wxALL|wxEXPAND, 5 ); lblPrefix = new wxStaticText( tabProperties, wxID_ANY, wxT("Prefix:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6806,7 +6792,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS bSizer391 = new wxBoxSizer( wxHORIZONTAL ); txtPrefix = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtPrefix->SetMaxLength( 0 ); bSizer391->Add( txtPrefix, 1, wxALL|wxEXPAND, 5 ); btnDetect = new wxButton( tabProperties, wxID_ANY, wxT("Detect"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); @@ -6839,7 +6824,14 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer431->Add( lblRefresh, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtRefresh = new wxTextCtrl( tabRefresh, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtRefresh->SetMaxLength( 5 ); + #ifdef __WXGTK__ + if ( !txtRefresh->HasFlag( wxTE_MULTILINE ) ) + { + txtRefresh->SetMaxLength( 5 ); + } + #else + txtRefresh->SetMaxLength( 5 ); + #endif fgSizer431->Add( txtRefresh, 1, wxALL, 5 ); @@ -6916,7 +6908,7 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con lblCertName = new wxStaticText( pnlTop, wxID_ANY, wxT("Certificate Name"), wxDefaultPosition, wxDefaultSize, 0 ); lblCertName->Wrap( -1 ); - lblCertName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + lblCertName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer389->Add( lblCertName, 0, wxALL, 5 ); @@ -7176,7 +7168,6 @@ frmImportResultsADT::frmImportResultsADT( wxWindow* parent, wxWindowID id, const bSizer396->Add( lblText, 0, wxALL, 5 ); txtResults = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); - txtResults->SetMaxLength( 0 ); bSizer396->Add( txtResults, 1, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer397;