Typos fixed and further clarification of the Python situation on Panther

[wxWidgets.git] / contrib / src / gizmos / editlbox.cpp

diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp
index c9ea5ae993071baf7ee5bc9ac0be250183714296..038579adbd18612cb10abdaa38a409ce09fcdf74 100644 (file)
--- a/contrib/src/gizmos/editlbox.cpp
+++ b/contrib/src/gizmos/editlbox.cpp
@@ -41,7 +41,7 @@ public:
                   const wxSize &size = wxDefaultSize,
                   long style = wxLC_ICON,
                   const wxValidator& validator = wxDefaultValidator,
-                  const wxString &name = "listctrl")
+                  const wxString &name = _T("listctrl"))
          : 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"
@@ -109,7 +112,7 @@ 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)
 {
     m_style = style;
     m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL;    
@@ -155,11 +158,11 @@ 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);
@@ -214,37 +217,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().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(""));
     }
 }
 
-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;
 
@@ -256,7 +260,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;