AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes to wxEditableListBox logic

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2002-03-16 19:33:29 +00:00
parent 333f4ac09d
commit 55232d19fe
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/include/wx/gizmos/editlbox.h
View File

@ -54,7 +54,6 @@ protected:
wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit; wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit;
wxListCtrl *m_listCtrl; wxListCtrl *m_listCtrl;
int m_selection; int m_selection;
bool m_edittingNew;
long m_style; long m_style;
void OnItemSelected(wxListEvent& event); void OnItemSelected(wxListEvent& event);

18
contrib/src/gizmos/editlbox.cpp
View File

@ -56,7 +56,11 @@ public:
void SizeColumns() void SizeColumns()
{ {
int w = GetSize().x; int w = GetSize().x;
#ifdef __WXMSW__
w -= wxSystemSettings::GetMetric(wxSYS_VSCROLL_X) + 6; w -= wxSystemSettings::GetMetric(wxSYS_VSCROLL_X) + 6;
#else
w -= 2*wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
#endif
SetColumnWidth(0, w); SetColumnWidth(0, w);
} }
@ -73,7 +77,6 @@ BEGIN_EVENT_TABLE(CleverListCtrl, wxListCtrl)
EVT_SIZE(CleverListCtrl::OnSize) EVT_SIZE(CleverListCtrl::OnSize)
END_EVENT_TABLE() END_EVENT_TABLE()
#include "eldel.xpm" #include "eldel.xpm"
#include "eldown.xpm" #include "eldown.xpm"
#include "eledit.xpm" #include "eledit.xpm"
@ -109,7 +112,7 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, const wxPoint& pos, const wxSize& size,
long style, long style,
const wxString& name) 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_style = style;
m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL; m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL;
@ -218,17 +221,18 @@ void wxEditableListBox::OnNewItem(wxCommandEvent& event)
{ {
m_listCtrl->SetItemState(m_listCtrl->GetItemCount()-1, m_listCtrl->SetItemState(m_listCtrl->GetItemCount()-1,
wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
m_edittingNew = TRUE;
m_listCtrl->EditLabel(m_selection); m_listCtrl->EditLabel(m_selection);
} }
void wxEditableListBox::OnEndLabelEdit(wxListEvent& event) void wxEditableListBox::OnEndLabelEdit(wxListEvent& event)
{ {
if (m_edittingNew) if ( event.GetIndex() == m_listCtrl->GetItemCount()-1 &&
!event.GetText().IsEmpty() )
{ {
m_edittingNew = FALSE; // The user edited last (empty) line, i.e. added new entry. We have to
if (!event.GetText().IsEmpty()) // add new empty line here so that adding one more line is still
m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), _T("")); // possible:
m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), _T(""));
} }
} }