Fixed bug in setting/getting value for wxComboBox. Read-only status

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

diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp
index 31872d7bf0bb49375527ffc619f7622966988d46..b8b1e8cb3b068db020b47dceac4910e7559d3876 100644 (file)
--- 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
 #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
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif


@@ -36,12 +36,12 @@ class CleverListCtrl : public wxListCtrl
 {
 public:
    CleverListCtrl(wxWindow *parent,
 {
 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 wxPoint &pos = wxDefaultPosition,
                   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();
          : wxListCtrl(parent, id, pos, size, style, validator, name)
     {
         CreateColumns();


@@ -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,28 +112,17 @@ 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_style = style;

+    m_bEdit = m_bNew = m_bDel = m_bUp = m_bDown = NULL;
+

     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 
     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);
                                 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
+    subsizer->Add(new wxStaticText(subp, wxID_ANY, label), 1, wxALIGN_CENTRE_VERTICAL | wxLEFT, 4);

 
 #ifdef __WXMSW__
     #define BTN_BORDER 4
 
 #ifdef __WXMSW__
     #define BTN_BORDER 4


@@ -141,29 +133,46 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
     #define BTN_BORDER 0
 #endif
 
     #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_EDIT))
-        m_bEdit->Show(FALSE);
-    if (!(m_style & wxEL_ALLOW_NEW))
-        m_bNew->Show(FALSE);
-    if (!(m_style & wxEL_ALLOW_DELETE))
-        m_bDel->Show(FALSE);
+    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);
     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);
 
     subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
 

-    subp->SetAutoLayout(TRUE);
+#if wxUSE_TOOLTIPS
+    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->SetSizer(subsizer);
     subsizer->Fit(subp);
 
     sizer->Add(subp, 0, wxEXPAND);
 
     long st = wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL | wxSUNKEN_BORDER;
     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;
+    if ( style & wxEL_ALLOW_EDIT )
+         st |= wxLC_EDIT_LABELS;

     m_listCtrl = new CleverListCtrl(this, wxID_ELD_LISTCTRL,
                                     wxDefaultPosition, wxDefaultSize, st);
     wxArrayString empty_ar;
     m_listCtrl = new CleverListCtrl(this, wxID_ELD_LISTCTRL,
                                     wxDefaultPosition, wxDefaultSize, st);
     wxArrayString empty_ar;


@@ -171,7 +180,6 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
 
     sizer->Add(m_listCtrl, 1, wxEXPAND);
 
 
     sizer->Add(m_listCtrl, 1, wxEXPAND);
 

-    SetAutoLayout(TRUE);

     SetSizer(sizer);
     Layout();
 }
     SetSizer(sizer);
     Layout();
 }


@@ -184,7 +192,7 @@ void wxEditableListBox::SetStrings(const wxArrayString& strings)
     for (i = 0; i < strings.GetCount(); i++)
         m_listCtrl->InsertItem(i, strings[i]);
 
     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);
 }
 
     m_listCtrl->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 


@@ -207,37 +215,38 @@ void wxEditableListBox::OnItemSelected(wxListEvent& event)
         m_bDel->Enable(m_selection < m_listCtrl->GetItemCount()-1);
 }
 
         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_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(), 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);
 }
 
 {
     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);
 }
 
 {
     m_listCtrl->EditLabel(m_selection);
 }
 

-void wxEditableListBox::OnUpItem(wxCommandEvent& event)
+void wxEditableListBox::OnUpItem(wxCommandEvent& WXUNUSED(event))

 {
     wxString t1, t2;
 
 {
     wxString t1, t2;
 


@@ -249,7 +258,7 @@ void wxEditableListBox::OnUpItem(wxCommandEvent& event)
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 

-void wxEditableListBox::OnDownItem(wxCommandEvent& event)
+void wxEditableListBox::OnDownItem(wxCommandEvent& WXUNUSED(event))

 {
     wxString t1, t2;
 
 {
     wxString t1, t2;