X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/923d52d6fec91f5f5df281bb1dffaa548cfacf8a..667e2c55eab8820efc2e7dc06611724641e9bcf3:/contrib/src/gizmos/editlbox.cpp diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp index 5e91e34e96..e7c065127d 100644 --- a/contrib/src/gizmos/editlbox.cpp +++ b/contrib/src/gizmos/editlbox.cpp @@ -56,7 +56,11 @@ public: void SizeColumns() { int w = GetSize().x; +#ifdef __WXMSW__ w -= wxSystemSettings::GetMetric(wxSYS_VSCROLL_X) + 6; +#else + w -= 2*wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); +#endif SetColumnWidth(0, w); } @@ -73,7 +77,6 @@ BEGIN_EVENT_TABLE(CleverListCtrl, wxListCtrl) EVT_SIZE(CleverListCtrl::OnSize) END_EVENT_TABLE() - #include "eldel.xpm" #include "eldown.xpm" #include "eledit.xpm" @@ -107,54 +110,72 @@ END_EVENT_TABLE() wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, const wxSize& size, + long style, const wxString& name) - : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name), m_edittingNew(FALSE) + : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name) { + m_style = style; + m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL; + wxSizer *sizer = new wxBoxSizer(wxVERTICAL); wxPanel *subp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER | wxTAB_TRAVERSAL); wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL); subsizer->Add(new wxStaticText(subp, -1, label), 1, wxALIGN_CENTRE_VERTICAL | wxLEFT, 4); - m_bEdit = new wxBitmapButton(subp, wxID_ELB_EDIT, wxBitmap(eledit_xpm)); - m_bNew = new wxBitmapButton(subp, wxID_ELB_NEW, wxBitmap(elnew_xpm)); - m_bDel = new wxBitmapButton(subp, wxID_ELB_DELETE, wxBitmap(eldel_xpm)); - m_bUp = new wxBitmapButton(subp, wxID_ELB_UP, wxBitmap(elup_xpm)); - m_bDown = new wxBitmapButton(subp, wxID_ELB_DOWN, wxBitmap(eldown_xpm)); - -#if wxUSE_TOOLTIPS - m_bEdit->SetToolTip(wxT("Edit item")); - m_bNew->SetToolTip(wxT("New item")); - m_bDel->SetToolTip(wxT("Delete item")); - m_bUp->SetToolTip(wxT("Move up")); - m_bDown->SetToolTip(wxT("Move down")); -#endif #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 + // 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 - subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); - subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); - subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); + if ( m_style & wxEL_ALLOW_EDIT ) + { + m_bEdit = new wxBitmapButton(subp, wxID_ELB_EDIT, wxBitmap(eledit_xpm)); + subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); + } + + if ( m_style & wxEL_ALLOW_NEW ) + { + m_bNew = new wxBitmapButton(subp, wxID_ELB_NEW, wxBitmap(elnew_xpm)); + subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); + } + + if ( m_style & wxEL_ALLOW_DELETE ) + { + m_bDel = new wxBitmapButton(subp, wxID_ELB_DELETE, wxBitmap(eldel_xpm)); + subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); + } + + m_bUp = new wxBitmapButton(subp, wxID_ELB_UP, wxBitmap(elup_xpm)); subsizer->Add(m_bUp, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); + + m_bDown = new wxBitmapButton(subp, wxID_ELB_DOWN, wxBitmap(eldown_xpm)); subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER); +#if wxUSE_TOOLTIPS + if ( m_bEdit ) m_bEdit->SetToolTip(wxT("Edit item")); + if ( m_bNew ) m_bNew->SetToolTip(wxT("New item")); + if ( m_bDel ) m_bDel->SetToolTip(wxT("Delete item")); + m_bUp->SetToolTip(wxT("Move up")); + m_bDown->SetToolTip(wxT("Move down")); +#endif + subp->SetAutoLayout(TRUE); subp->SetSizer(subsizer); subsizer->Fit(subp); sizer->Add(subp, 0, wxEXPAND); + + long st = wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL | wxSUNKEN_BORDER; + if ( style & wxEL_ALLOW_EDIT ) + st |= wxLC_EDIT_LABELS; m_listCtrl = new CleverListCtrl(this, wxID_ELD_LISTCTRL, - wxDefaultPosition, wxDefaultSize, - wxLC_REPORT | wxLC_NO_HEADER | - wxLC_SINGLE_SEL | wxSUNKEN_BORDER | - wxLC_EDIT_LABELS); + wxDefaultPosition, wxDefaultSize, st); wxArrayString empty_ar; SetStrings(empty_ar); @@ -190,25 +211,28 @@ void wxEditableListBox::OnItemSelected(wxListEvent& event) m_selection = event.GetIndex(); m_bUp->Enable(m_selection != 0 && m_selection < m_listCtrl->GetItemCount()-1); m_bDown->Enable(m_selection < m_listCtrl->GetItemCount()-2); - m_bEdit->Enable(m_selection < m_listCtrl->GetItemCount()-1); - m_bDel->Enable(m_selection < m_listCtrl->GetItemCount()-1); + if (m_style & wxEL_ALLOW_EDIT) + m_bEdit->Enable(m_selection < m_listCtrl->GetItemCount()-1); + if (m_style & wxEL_ALLOW_DELETE) + m_bDel->Enable(m_selection < m_listCtrl->GetItemCount()-1); } void wxEditableListBox::OnNewItem(wxCommandEvent& event) { m_listCtrl->SetItemState(m_listCtrl->GetItemCount()-1, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - m_edittingNew = TRUE; m_listCtrl->EditLabel(m_selection); } void wxEditableListBox::OnEndLabelEdit(wxListEvent& event) { - if (m_edittingNew) + if ( event.GetIndex() == m_listCtrl->GetItemCount()-1 && + !event.GetText().IsEmpty() ) { - m_edittingNew = FALSE; - if (!event.GetText().IsEmpty()) - m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), _T("")); + // The user edited last (empty) line, i.e. added new entry. We have to + // add new empty line here so that adding one more line is still + // possible: + m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), _T("")); } }