github-starred/pgadmin3
2
0
Fork 0
mirror of https://github.com/levinsv/pgadmin3.git synced 2026-05-15 14:15:49 -06:00
Code Issues 6 Projects Packages Wiki Activity Actions

Migration to wxWidgets 3.1.5

Browse source 
Выполнен переход на новые библтотеки. Устранены проблемы совместимости.
Множество мелких правок.
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
Download patch file Download diff file Expand all files Collapse all files

18
ctl/ctlDefaultSecurityPanel.cpp
View file

@ -142,14 +142,14 @@ ctlDefaultPrivilegesPanel::ctlDefaultPrivilegesPanel(ctlDefaultSecurityPanel *de
lbPrivileges->SetImageList(imgList, wxIMAGE_LIST_SMALL);
lbPrivileges->AddColumn(_("Role/Group"), 60, wxLIST_FORMAT_LEFT);
lbPrivileges->AddColumn(_("Privileges"), 60, 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_DEFADDPRIV, _("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_DEFDELPRIV, _("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"));
@ -158,11 +158,11 @@ ctlDefaultPrivilegesPanel::ctlDefaultPrivilegesPanel(ctlDefaultSecurityPanel *de
wxBoxSizer *itemSizer4a = new wxBoxSizer(wxHORIZONTAL);
stGroup = new wxStaticText(this, CTL_DEFSTATICGROUP, strGroupLabel);
itemSizer4a->Add(stGroup, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
itemSizer4a->Add(stGroup, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 4);
cbGroups = new ctlComboBox(this, CTL_DEFCBGROUP, wxDefaultPosition, wxDefaultSize);
cbGroups->Append(wxT("public"));
cbGroups->SetSelection(0);
itemSizer4a->Add(cbGroups, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer4a->Add(cbGroups, wxEXPAND | wxTOP | wxLEFT | wxRIGHT);
itemSizer3->Add(itemSizer4a, 0, wxEXPAND | wxALL, 0);
/* border size depends on the plateform */
@ -178,9 +178,9 @@ ctlDefaultPrivilegesPanel::ctlDefaultPrivilegesPanel(ctlDefaultSecurityPanel *de
wxBoxSizer *itemSizer5 = new wxBoxSizer(wxHORIZONTAL);
allPrivileges = new wxCheckBox(this, CTL_DEFALLPRIV, wxT("ALL"));
itemSizer5->Add(allPrivileges, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer5->Add(allPrivileges, wxEXPAND | wxTOP | wxLEFT | wxRIGHT);
allPrivilegesGrant = new wxCheckBox(this, CTL_DEFALLPRIVGRANT, wxT("WITH GRANT OPTION"));
itemSizer5->Add(allPrivilegesGrant, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer5->Add(allPrivilegesGrant, wxEXPAND | wxTOP | wxLEFT | wxRIGHT);
allPrivilegesGrant->Disable();
itemSizer3->Add(itemSizer5, 0, wxALL, bordersize);
@ -193,10 +193,10 @@ ctlDefaultPrivilegesPanel::ctlDefaultPrivilegesPanel(ctlDefaultSecurityPanel *de
wxCheckBox *cb;
wxBoxSizer *itemSizer6 = new wxBoxSizer(wxHORIZONTAL);
cb = new wxCheckBox(this, CTL_DEFPRIVCB + i, priv);
itemSizer6->Add(cb, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer6->Add(cb, wxEXPAND | wxTOP | wxLEFT | wxRIGHT);
privCheckboxes[i++] = cb;
cb = new wxCheckBox(this, CTL_DEFPRIVCB + i, wxT("WITH GRANT OPTION"));
itemSizer6->Add(cb, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer6->Add(cb, wxEXPAND | wxTOP | wxLEFT | wxRIGHT);
cb->Disable();
privCheckboxes[i] = cb;
itemSizer3->Add(itemSizer6, 0, wxALL, bordersize);