Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary border around wxEditableListBox buttons

Browse Source 
This border was added under MSW for some reason, but doesn't seem to be
necessary (any longer?).

Closes #18265.
This commit is contained in:
Vadim Zeitlin
2018-11-03 22:39:57 +01:00
parent 63c602c3d2
commit 18e2b58e5b
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/generic/editlbox.cpp
View File

@@ -123,45 +123,36 @@ bool wxEditableListBox::Create(wxWindow *parent, wxWindowID id,
wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL);
subsizer->Add(new wxStaticText(subp, wxID_ANY, label), 1, wxALIGN_CENTRE_VERTICAL | wxLEFT, 4); subsizer->Add(new wxStaticText(subp, wxID_ANY, label), 1, wxALIGN_CENTRE_VERTICAL | wxLEFT, 4);
#ifdef __WXMSW__
#define BTN_BORDER 4
// FIXME - why is this needed? There's some reason why sunken border is
// ignored by sizers in wxMSW but not in wxGTK that I can't
// figure out...
#else
#define BTN_BORDER 0
#endif
if ( m_style & wxEL_ALLOW_EDIT ) if ( m_style & wxEL_ALLOW_EDIT )
{ {
m_bEdit = new wxBitmapButton(subp, wxID_ELB_EDIT, m_bEdit = new wxBitmapButton(subp, wxID_ELB_EDIT,
wxArtProvider::GetBitmap(wxART_EDIT, wxART_BUTTON)); wxArtProvider::GetBitmap(wxART_EDIT, wxART_BUTTON));
subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL);
} }
if ( m_style & wxEL_ALLOW_NEW ) if ( m_style & wxEL_ALLOW_NEW )
{ {
m_bNew = new wxBitmapButton(subp, wxID_ELB_NEW, m_bNew = new wxBitmapButton(subp, wxID_ELB_NEW,
wxArtProvider::GetBitmap(wxART_NEW, wxART_BUTTON)); wxArtProvider::GetBitmap(wxART_NEW, wxART_BUTTON));
subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL);
} }
if ( m_style & wxEL_ALLOW_DELETE ) if ( m_style & wxEL_ALLOW_DELETE )
{ {
m_bDel = new wxBitmapButton(subp, wxID_ELB_DELETE, m_bDel = new wxBitmapButton(subp, wxID_ELB_DELETE,
wxArtProvider::GetBitmap(wxART_DELETE, wxART_BUTTON)); wxArtProvider::GetBitmap(wxART_DELETE, wxART_BUTTON));
subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL);
} }
if (!(m_style & wxEL_NO_REORDER)) if (!(m_style & wxEL_NO_REORDER))
{ {
m_bUp = new wxBitmapButton(subp, wxID_ELB_UP, m_bUp = new wxBitmapButton(subp, wxID_ELB_UP,
wxArtProvider::GetBitmap(wxART_GO_UP, wxART_BUTTON)); wxArtProvider::GetBitmap(wxART_GO_UP, wxART_BUTTON));
subsizer->Add(m_bUp, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); subsizer->Add(m_bUp, 0, wxALIGN_CENTRE_VERTICAL);
m_bDown = new wxBitmapButton(subp, wxID_ELB_DOWN, m_bDown = new wxBitmapButton(subp, wxID_ELB_DOWN,
wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_BUTTON)); wxArtProvider::GetBitmap(wxART_GO_DOWN, wxART_BUTTON));
subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL);
} }
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS