X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd1d4b137b0da06b8bce062750809e9631fbb616..209f3e1453dd576919bf1cc8f696218dae23c34b:/contrib/src/gizmos/editlbox.cpp diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp index 0c40600798..1e0271a58c 100644 --- a/contrib/src/gizmos/editlbox.cpp +++ b/contrib/src/gizmos/editlbox.cpp @@ -19,7 +19,7 @@ #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all "standard" wxWindows headers) +// need because it includes almost all "standard" wxWidgets headers) #ifndef WX_PRECOMP #include "wx/wx.h" #endif @@ -36,12 +36,12 @@ class CleverListCtrl : public wxListCtrl { public: CleverListCtrl(wxWindow *parent, - wxWindowID id = -1, + wxWindowID id = wxID_ANY, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, - const wxString &name = "listctrl") + const wxString &name = wxListCtrlNameStr) : wxListCtrl(parent, id, pos, size, style, validator, name) { CreateColumns(); @@ -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" @@ -82,21 +85,18 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(wxEditableListBox, wxPanel) -enum -{ - // ID value doesn't matter, it won't propagate out of wxEditableListBox - // instance - wxID_ELB_DELETE = wxID_HIGHEST + 1, - wxID_ELB_NEW, - wxID_ELB_UP, - wxID_ELB_DOWN, - wxID_ELB_EDIT, - wxID_ELD_LISTCTRL -}; +// NB: generate the IDs at runtime to avoid conflict with XRCID values, +// they could cause XRCCTRL() failures in XRC-based dialogs +const int wxID_ELB_DELETE = wxNewId(); +const int wxID_ELB_EDIT = wxNewId(); +const int wxID_ELB_NEW = wxNewId(); +const int wxID_ELB_UP = wxNewId(); +const int wxID_ELB_DOWN = wxNewId(); +const int wxID_ELB_LISTCTRL = wxNewId(); BEGIN_EVENT_TABLE(wxEditableListBox, wxPanel) - EVT_LIST_ITEM_SELECTED(wxID_ELD_LISTCTRL, wxEditableListBox::OnItemSelected) - EVT_LIST_END_LABEL_EDIT(wxID_ELD_LISTCTRL, wxEditableListBox::OnEndLabelEdit) + EVT_LIST_ITEM_SELECTED(wxID_ELB_LISTCTRL, wxEditableListBox::OnItemSelected) + EVT_LIST_END_LABEL_EDIT(wxID_ELB_LISTCTRL, wxEditableListBox::OnEndLabelEdit) EVT_BUTTON(wxID_ELB_NEW, wxEditableListBox::OnNewItem) EVT_BUTTON(wxID_ELB_UP, wxEditableListBox::OnUpItem) EVT_BUTTON(wxID_ELB_DOWN, wxEditableListBox::OnDownItem) @@ -109,21 +109,17 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id, 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) { -<<<<<<< editlbox.cpp m_style = style; - m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL; + m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL; -======= - m_style = style; ->>>>>>> 1.10 wxSizer *sizer = new wxBoxSizer(wxVERTICAL); - wxPanel *subp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, + wxPanel *subp = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER | wxTAB_TRAVERSAL); wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL); - subsizer->Add(new wxStaticText(subp, -1, 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 @@ -159,14 +155,13 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id, 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")); + if ( m_bEdit ) m_bEdit->SetToolTip(_("Edit item")); + if ( m_bNew ) m_bNew->SetToolTip(_("New item")); + if ( m_bDel ) m_bDel->SetToolTip(_("Delete item")); + m_bUp->SetToolTip(_("Move up")); + m_bDown->SetToolTip(_("Move down")); #endif - subp->SetAutoLayout(TRUE); subp->SetSizer(subsizer); subsizer->Fit(subp); @@ -175,14 +170,13 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id, 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, + m_listCtrl = new CleverListCtrl(this, wxID_ELB_LISTCTRL, wxDefaultPosition, wxDefaultSize, st); wxArrayString empty_ar; SetStrings(empty_ar); sizer->Add(m_listCtrl, 1, wxEXPAND); - SetAutoLayout(TRUE); SetSizer(sizer); Layout(); } @@ -195,7 +189,7 @@ void wxEditableListBox::SetStrings(const wxArrayString& strings) for (i = 0; i < strings.GetCount(); i++) m_listCtrl->InsertItem(i, strings[i]); - m_listCtrl->InsertItem(strings.GetCount(), _T("")); + m_listCtrl->InsertItem(strings.GetCount(), wxEmptyString); m_listCtrl->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } @@ -218,37 +212,38 @@ void wxEditableListBox::OnItemSelected(wxListEvent& event) m_bDel->Enable(m_selection < m_listCtrl->GetItemCount()-1); } -void wxEditableListBox::OnNewItem(wxCommandEvent& event) +void wxEditableListBox::OnNewItem(wxCommandEvent& WXUNUSED(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().empty() ) { - 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(), wxEmptyString); } } -void wxEditableListBox::OnDelItem(wxCommandEvent& event) +void wxEditableListBox::OnDelItem(wxCommandEvent& WXUNUSED(event)) { m_listCtrl->DeleteItem(m_selection); m_listCtrl->SetItemState(m_selection, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } -void wxEditableListBox::OnEditItem(wxCommandEvent& event) +void wxEditableListBox::OnEditItem(wxCommandEvent& WXUNUSED(event)) { m_listCtrl->EditLabel(m_selection); } -void wxEditableListBox::OnUpItem(wxCommandEvent& event) +void wxEditableListBox::OnUpItem(wxCommandEvent& WXUNUSED(event)) { wxString t1, t2; @@ -260,7 +255,7 @@ void wxEditableListBox::OnUpItem(wxCommandEvent& event) wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } -void wxEditableListBox::OnDownItem(wxCommandEvent& event) +void wxEditableListBox::OnDownItem(wxCommandEvent& WXUNUSED(event)) { wxString t1, t2;