Skip to content

Attempt to fix as many sizer warnings as possible #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ntninja wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Attempt to fix as many sizer warnings as possible #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ad1d8b
fix #35 - assert !(flags & (wxALIGN_BOTTOM | wxALIGN_CENTRE_VERTICAL)…
gilbertoca Feb 24, 2025
3925cde
fix #37 - Error: XRC error: 494: wxALIGN_CENTRE has no effect when co…
gilbertoca Feb 24, 2025
2b3684c
Fix all sizer errors in schema dialog and many across the entire code…
ntninja Aug 29, 2025
58117c3
Fix hopefully all sizer flag assertions and most XRC warning dialogs
ntninja Aug 30, 2025
fb3c353
Fix wxALIGN* vs wxEXPAND in the first section of the options dialog
ntninja Aug 30, 2025
ded8170
Refresh xrcDialogs.cpp
ntninja Aug 30, 2025
a3cf261
Replace wxALIGN_EXPAND with wxALIGN_CENTER
ntninja Aug 31, 2025
f3ce98a
Fix wxALIGN_* vs wxEXAND in most dialogs
ntninja Aug 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pgadmin/agent/dlgStep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dlgStep::dlgStep(pgaFactory *f, frmMain *frame, pgaStep *node, pgaJob *j)

wxWindow *placeholder = CTRL_TEXT("txtSqlBox");
wxSizer *sizer = placeholder->GetContainingSizer();
sizer->Add(sqlBox, 1, wxRIGHT | wxGROW, 5);
sizer->Add(sqlBox, 1, wxRIGHT | wxEXPAND, 5);
sizer->Detach(placeholder);
delete placeholder;
sizer->Layout();
Expand Down
18 changes: 9 additions & 9 deletions pgadmin/ctl/ctlDefaultSecurityPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | wxBOTTOM | 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, wxALIGN_CENTRE_VERTICAL | 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, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
item0->Add(itemSizer2, 0, wxEXPAND | wxALL, 0);

wxStaticBox *sb = new wxStaticBox(this, -1, _("Privileges"));
Expand All @@ -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, wxALIGN_CENTRE_VERTICAL | 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 */
Expand All @@ -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, wxALIGN_CENTRE_VERTICAL | 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, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
allPrivilegesGrant->Disable();
itemSizer3->Add(itemSizer5, 0, wxALL, bordersize);

Expand All @@ -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, wxALIGN_CENTRE_VERTICAL | 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, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
cb->Disable();
privCheckboxes[i] = cb;
itemSizer3->Add(itemSizer6, 0, wxALL, bordersize);
Expand Down
14 changes: 7 additions & 7 deletions pgadmin/ctl/ctlSeclabelPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,29 +58,29 @@ ctlSeclabelPanel::ctlSeclabelPanel(wxNotebook *nb)
lbSeclabels = new ctlListView(this, CTL_LBSECLABEL, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER | wxLC_REPORT);
lbSeclabels->AddColumn(_("Provider"), 70, wxLIST_FORMAT_LEFT);
lbSeclabels->AddColumn(_("Security label"), 70, wxLIST_FORMAT_LEFT);
sizer1->Add(lbSeclabels, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
sizer1->Add(lbSeclabels, 0, wxEXPAND | wxBOTTOM | wxTOP | wxLEFT | wxRIGHT, 4);
sizer0->Add(sizer1, 0, wxEXPAND | wxALL, 5);

// buttons sizer
wxBoxSizer *sizer2 = new wxBoxSizer(wxHORIZONTAL);
btnAddSeclabel = new wxButton(this, CTL_ADDSECLABEL, _("Add/Change"));
sizer2->Add(btnAddSeclabel, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
sizer2->Add(btnAddSeclabel, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
btnDelSeclabel = new wxButton(this, CTL_DELSECLABEL, _("Remove"));
sizer2->Add(btnDelSeclabel, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
sizer2->Add(btnDelSeclabel, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
sizer0->Add(sizer2, 0, wxEXPAND | wxALL, 0);


// textboxes sizer
wxFlexGridSizer *sizer3 = new wxFlexGridSizer(2, 2, 5, 5);
sizer3->AddGrowableCol(1);
label = new wxStaticText(this, 0, _("Provider"));
sizer3->Add(label, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
sizer3->Add(label, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
txtProvider = new wxTextCtrl(this, CTL_PROVIDER);
sizer3->Add(txtProvider, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
sizer3->Add(txtProvider, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 4);
label = new wxStaticText(this, 0, _("Security label"));
sizer3->Add(label, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
sizer3->Add(label, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
txtSeclabel = new wxTextCtrl(this, CTL_SECLABEL);
sizer3->Add(txtSeclabel, 0, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
sizer3->Add(txtSeclabel, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 4);
sizer0->Add(sizer3, 0, wxEXPAND | wxALL, 5);

// compute sizes
Expand Down
18 changes: 9 additions & 9 deletions pgadmin/ctl/ctlSecurityPanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, wxALIGN_CENTRE_VERTICAL | 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, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT, 4);
item0->Add(itemSizer2, 0, wxEXPAND | wxALL, 0);

wxStaticBox *sb = new wxStaticBox(this, -1, _("Privileges"));
Expand All @@ -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, wxALIGN_CENTRE_VERTICAL | 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, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer3->Add(itemSizer4, 0, wxEXPAND | wxALL, 0);

/* border size depends on the plateform */
Expand All @@ -120,9 +120,9 @@ ctlSecurityPanel::ctlSecurityPanel(wxNotebook *nb, const wxString &privList, con
{
wxBoxSizer *itemSizer5 = new wxBoxSizer(wxHORIZONTAL);
allPrivileges = new wxCheckBox(this, CTL_ALLPRIV, wxT("ALL"));
itemSizer5->Add(allPrivileges, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer5->Add(allPrivileges, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
allPrivilegesGrant = new wxCheckBox(this, CTL_ALLPRIVGRANT, wxT("WITH GRANT OPTION"));
itemSizer5->Add(allPrivilegesGrant, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer5->Add(allPrivilegesGrant, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
allPrivilegesGrant->Disable();
itemSizer3->Add(itemSizer5, 0, wxALL, bordersize);
}
Expand All @@ -133,10 +133,10 @@ ctlSecurityPanel::ctlSecurityPanel(wxNotebook *nb, const wxString &privList, con
wxCheckBox *cb;
wxBoxSizer *itemSizer6 = new wxBoxSizer(wxHORIZONTAL);
cb = new wxCheckBox(this, CTL_PRIVCB + i, priv);
itemSizer6->Add(cb, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer6->Add(cb, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
privCheckboxes[i++] = cb;
cb = new wxCheckBox(this, CTL_PRIVCB + i, wxT("WITH GRANT OPTION"));
itemSizer6->Add(cb, wxEXPAND | wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
itemSizer6->Add(cb, wxALIGN_CENTRE_VERTICAL | wxTOP | wxLEFT | wxRIGHT);
cb->Disable();
privCheckboxes[i++] = cb;
itemSizer3->Add(itemSizer6, 0, wxALL, bordersize);
Expand Down
8 changes: 4 additions & 4 deletions pgadmin/dd/dditems/utilities/ddSelectKindFksDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void ddSelectKindFksDialog::CreateControls()
// A dividing line before the mapping items and kind of mapping
line = new wxStaticLine ( this, wxID_STATIC,
wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
topSizer->Add(line, 0, wxGROW | wxALL, 5);
topSizer->Add(line, 0, wxEXPAND | wxALL, 5);


//Hack to allow multiple pairs of wxStaticText wxchoice at dialog
Expand All @@ -131,7 +131,7 @@ void ddSelectKindFksDialog::CreateControls()

line = new wxStaticLine ( this, wxID_STATIC,
wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
topSizer->Add(line, 0, wxGROW | wxALL, 5);
topSizer->Add(line, 0, wxEXPAND | wxALL, 5);

// A horizontal box sizer to contain Reset, OK, Cancel and Help

Expand Down Expand Up @@ -209,7 +209,7 @@ void ddSelectKindFksDialog::populateColumnsControls(bool primaryKey, int useUkIn
ddSelectFkKindLine *newLineControls = new ddSelectFkKindLine(this, sourceCols[i], destCols, eventID);
choices[ sourceCols[i] ] = newLineControls;
linesSizer->Add(newLineControls->sourceCtrl, 0, wxALIGN_LEFT | wxALL, 5);
linesSizer->Add(newLineControls->destinationCtrl, 0, wxGROW | wxALL, 5);
linesSizer->Add(newLineControls->destinationCtrl, 0, wxEXPAND | wxALL, 5);
}
}
else
Expand All @@ -229,7 +229,7 @@ void ddSelectKindFksDialog::populateColumnsControls(bool primaryKey, int useUkIn
ddSelectFkKindLine *newLineControls = new ddSelectFkKindLine(this, sourceCols[i], destCols, eventID);
choices[ sourceCols[i] ] = newLineControls;
linesSizer->Add(newLineControls->sourceCtrl, 0, wxALIGN_LEFT | wxALL, 5);
linesSizer->Add(newLineControls->destinationCtrl, 0, wxGROW | wxALL, 5);
linesSizer->Add(newLineControls->destinationCtrl, 0, wxEXPAND | wxALL, 5);
}
}
this->Layout();
Expand Down
2 changes: 1 addition & 1 deletion pgadmin/frm/frmQuery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ frmQuery::frmQuery(frmMain *form, const wxString &_title, pgConn *_conn, const w
sqlQueries = new wxComboBox(pnlQuery, CTL_SQLQUERYCBOX, wxT(""), wxDefaultPosition, wxDefaultSize, wxArrayString(), wxCB_DROPDOWN | wxCB_READONLY);
sqlQueries->SetToolTip(_("Previous queries"));
LoadQueries();
boxHistory->Add(sqlQueries, 1, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, 1);
boxHistory->Add(sqlQueries, 1, wxEXPAND | wxALL, 1);

// Delete Current button
btnDeleteCurrent = new wxButton(pnlQuery, CTL_DELETECURRENTBTN, _("Delete"));
Expand Down
8 changes: 4 additions & 4 deletions pgadmin/frm/frmStatus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ void frmStatus::AddStatusPane()
#ifdef __WXMAC__
wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), false);
#endif
grdActivity->Add(lstStatus, 0, wxGROW, 3);
grdActivity->Add(lstStatus, 0, wxEXPAND, 3);

// Add the panel to the notebook
manager.AddPane(pnlActivity,
Expand Down Expand Up @@ -657,7 +657,7 @@ void frmStatus::AddLockPane()
#ifdef __WXMAC__
wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), false);
#endif
grdLock->Add(lstLocks, 0, wxGROW, 3);
grdLock->Add(lstLocks, 0, wxEXPAND, 3);

// Add the panel to the notebook
manager.AddPane(pnlLock,
Expand Down Expand Up @@ -746,7 +746,7 @@ void frmStatus::AddXactPane()
#ifdef __WXMAC__
wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), false);
#endif
grdXacts->Add(lstXacts, 0, wxGROW, 3);
grdXacts->Add(lstXacts, 0, wxEXPAND, 3);

// Add the panel to the notebook
manager.AddPane(pnlXacts,
Expand Down Expand Up @@ -849,7 +849,7 @@ void frmStatus::AddLogPane()
#ifdef __WXMAC__
wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), false);
#endif
grdLog->Add(lstLog, 0, wxGROW, 3);
grdLog->Add(lstLog, 0, wxEXPAND, 3);

// Add the panel to the notebook
manager.AddPane(pnlLog,
Expand Down
2 changes: 1 addition & 1 deletion pgadmin/hotdraw/utilities/hdRemoveDeleteDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void hdRemoveDeleteDialog::CreateControls(const wxString &message)
topSizer->AddSpacer(10);
line = new wxStaticLine ( this, wxID_STATIC,
wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
topSizer->Add(line, 0, wxGROW | wxALL, 5);
topSizer->Add(line, 0, wxEXPAND | wxALL, 5);

//Buttons Sizer
buttonsSizer = new wxBoxSizer(wxHORIZONTAL );
Expand Down
8 changes: 4 additions & 4 deletions pgadmin/ui/ddPrecisionScaleDialog.xrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<object class="sizeritem">
<object class="wxTextCtrl" name="txtPrecision">
</object>
<flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
<flag>wxALIGN_CENTER|wxTOP|wxLEFT|wxRIGHT</flag>
<border>4</border>
</object>
<object class="sizeritem">
Expand All @@ -43,14 +43,14 @@
<object class="sizeritem">
<object class="wxTextCtrl" name="txtScale">
</object>
<flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
<flag>wxALIGN_CENTER|wxTOP|wxLEFT|wxRIGHT</flag>
<border>4</border>
</object>
</object>
</object>
</object>
</object>
<flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
<flag>wxALIGN_CENTRE|wxALL</flag>
<border>3</border>
</object>
<object class="sizeritem">
Expand Down Expand Up @@ -89,7 +89,7 @@
<object class="wxStatusBar" name="unkStatusBar">
<style>wxST_SIZEGRIP</style>
</object>
<flag>wxEXPAND|wxALIGN_CENTRE</flag>
<flag>wxALIGN_CENTRE</flag>
<border>3</border>
</object>
</object>
Expand Down
6 changes: 3 additions & 3 deletions pgadmin/ui/ddTableNameDialog.xrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
<object class="sizeritem">
<object class="wxTextCtrl" name="txtUsualTableName">
</object>
<flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
<flag>wxALIGN_CENTER|wxTOP|wxLEFT|wxRIGHT</flag>
<border>4</border>
</object>
</object>
</object>
</object>
</object>
<flag>wxEXPAND|wxALIGN_CENTRE|wxALL</flag>
<flag>wxALIGN_CENTRE|wxALL</flag>
<border>3</border>
</object>
<object class="sizeritem">
Expand Down Expand Up @@ -76,7 +76,7 @@
<object class="wxStatusBar" name="unkStatusBar">
<style>wxST_SIZEGRIP</style>
</object>
<flag>wxEXPAND|wxALIGN_CENTRE</flag>
<flag>wxALIGN_CENTRE</flag>
<border>3</border>
</object>
</object>
Expand Down
10 changes: 5 additions & 5 deletions pgadmin/ui/dlgAddFavourite.xrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<object class="sizeritem">
<object class="wxTextCtrl" name="txtTitle">
</object>
<flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
<flag>wxALIGN_CENTER|wxTOP|wxLEFT|wxRIGHT</flag>
<border>4</border>
</object>
<object class="sizeritem">
Expand All @@ -35,7 +35,7 @@
<object class="ctlTree" name="trLocation">
<style>wxTR_HAS_BUTTONS | wxSIMPLE_BORDER</style>
</object>
<flag>wxEXPAND|wxALIGN_CENTRE_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
<flag>wxALIGN_CENTER|wxTOP|wxLEFT|wxRIGHT</flag>
<border>4</border>
</object>
<object class="sizeritem">
Expand All @@ -46,7 +46,7 @@
<object class="wxButton" name="btnNewFolder">
<label>New Folder</label>
</object>
<flag>wxLEFT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
<flag>wxLEFT|wxALIGN_CENTER</flag>
<border>4</border>
</object>
<object class="spacer">
Expand All @@ -66,14 +66,14 @@
<label>&amp;OK</label>
<default>1</default>
</object>
<flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
<flag>wxBOTTOM|wxLEFT|wxRIGHT|wxALIGN_CENTER</flag>
<border>4</border>
</object>
<object class="sizeritem">
<object class="wxButton" name="wxID_CANCEL">
<label>&amp;Cancel</label>
</object>
<flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
<flag>wxBOTTOM|wxLEFT|wxRIGHT|wxALIGN_CENTER</flag>
<border>4</border>
</object>
</object>
Expand Down
Loading
Loading