fixes to wxEditableListBox logic

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/gizmos/editlbox.h b/contrib/include/wx/gizmos/editlbox.h
index 0ad413041380e209cde77fc375b40d89ae9938fc..b73e17f94ae94880405557da1f64d2c68c5174a2 100644 (file)
--- a/contrib/include/wx/gizmos/editlbox.h
+++ b/contrib/include/wx/gizmos/editlbox.h
@@ -54,7 +54,6 @@ protected:
     wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit;
     wxListCtrl *m_listCtrl;
     int m_selection;
     wxBitmapButton *m_bDel, *m_bNew, *m_bUp, *m_bDown, *m_bEdit;
     wxListCtrl *m_listCtrl;
     int m_selection;

-    bool m_edittingNew;

     long m_style;
 
     void OnItemSelected(wxListEvent& event);
     long m_style;
 
     void OnItemSelected(wxListEvent& event);

diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp
index c9ea5ae993071baf7ee5bc9ac0be250183714296..e7c065127d029dc974b659f844d294fb75b97381 100644 (file)
--- a/contrib/src/gizmos/editlbox.cpp
+++ b/contrib/src/gizmos/editlbox.cpp
@@ -56,7 +56,11 @@ public:
     void SizeColumns()
     {
          int w = GetSize().x;
     void SizeColumns()
     {
          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)
 END_EVENT_TABLE()
 
    EVT_SIZE(CleverListCtrl::OnSize)
 END_EVENT_TABLE()
 

-

 #include "eldel.xpm"
 #include "eldown.xpm"
 #include "eledit.xpm"
 #include "eldel.xpm"
 #include "eldown.xpm"
 #include "eledit.xpm"


@@ -109,7 +112,7 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
                           const wxPoint& pos, const wxSize& size,
                           long style,
                           const wxString& name)
                           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;    
 {
     m_style = style;
     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,
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 {
     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)
 {
     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(""));

     }
 }
 
     }
 }