Migration to wxWidgets 3.1.5

Выполнен переход на новые библтотеки. Устранены проблемы совместимости.
Множество мелких правок.
This commit is contained in:
lsv 2021-05-21 11:09:20 +05:00
parent 4293a1e9e8
commit 2734a746a9
94 changed files with 1409 additions and 1241 deletions

View file

@ -79,14 +79,14 @@ ctlSecurityPanel::ctlSecurityPanel(wxNotebook *nb, const wxString &privList, con
lbPrivileges->SetImageList(imgList, wxIMAGE_LIST_SMALL);
lbPrivileges->AddColumn(_("User/Group"), 70, wxLIST_FORMAT_LEFT);
lbPrivileges->AddColumn(_("Privileges"), 70, wxLIST_FORMAT_LEFT);
itemSizer1->Add(lbPrivileges, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
itemSizer1->Add(lbPrivileges, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 4);
item0->Add(itemSizer1, 0, wxEXPAND | wxALL, 5);
wxBoxSizer *itemSizer2 = new wxBoxSizer(wxHORIZONTAL);
btnAddPriv = new wxButton(this, CTL_ADDPRIV, _("Add/Change"));
itemSizer2->Add(btnAddPriv, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
itemSizer2->Add(btnAddPriv, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 4);
btnDelPriv = new wxButton(this, CTL_DELPRIV, _("Remove"));
itemSizer2->Add(btnDelPriv, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
itemSizer2->Add(btnDelPriv, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 4);
item0->Add(itemSizer2, 0, wxEXPAND | wxALL, 0);
wxStaticBox *sb = new wxStaticBox(this, -1, _("Privileges"));
@ -98,11 +98,11 @@ ctlSecurityPanel::ctlSecurityPanel(wxNotebook *nb, const wxString &privList, con
#ifdef __WXMSW__
stGroup->SetMinSize(wxSize(30, 15));
#endif // __WXMSW__
itemSizer4->Add(stGroup, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
itemSizer4->Add(stGroup, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 4);
cbGroups = new ctlComboBox(this, CTL_CBGROUP, wxDefaultPosition, wxDefaultSize);
cbGroups->Append(wxT("public"));
cbGroups->SetSelection(0);
itemSizer4->Add(cbGroups, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer4->Add(cbGroups, wxEXPAND | wxTOP | wxLEFT | wxRIGHT);
itemSizer3->Add(itemSizer4, 0, wxEXPAND | wxALL, 0);
/* border size depends on the plateform */