fixed MSVC compilation and warnings

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

diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp
index 5f3b77a2f0095ff25aa1141b30a392a9f97e5d7f..31872d7bf0bb49375527ffc619f7622966988d46 100644 (file)
--- a/contrib/src/gizmos/editlbox.cpp
+++ b/contrib/src/gizmos/editlbox.cpp
@@ -56,7 +56,7 @@ public:
     void SizeColumns()
     {
          int w = GetSize().x;
-         w -= wxSystemSettings::GetSystemMetric(wxSYS_VSCROLL_X) + 6;
+         w -= wxSystemSettings::GetMetric(wxSYS_VSCROLL_X) + 6;
          SetColumnWidth(0, w);
     }
 
@@ -65,6 +65,7 @@ private:
     void OnSize(wxSizeEvent& event)
     {
         SizeColumns();
+        event.Skip();
     }
 };
 
@@ -81,7 +82,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxEditableListBox, wxPanel)
 
-enum 
+enum
 {
     // ID value doesn't matter, it won't propagate out of wxEditableListBox
     // instance
@@ -106,11 +107,13 @@ END_EVENT_TABLE()
 wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
                           const wxString& label,
                           const wxPoint& pos, const wxSize& size,
+                          long style,
                           const wxString& name)
    : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name), m_edittingNew(FALSE)
 {
+    m_style = style;
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-    
+
     wxPanel *subp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize,
                                 wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
     wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL);
@@ -120,41 +123,68 @@ wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
     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));
-    subsizer->Add(m_bEdit, 0, wxALIGN_CENTRE_VERTICAL);
-    subsizer->Add(m_bNew, 0, wxALIGN_CENTRE_VERTICAL);
-    subsizer->Add(m_bDel, 0, wxALIGN_CENTRE_VERTICAL);
-    subsizer->Add(m_bUp, 0, wxALIGN_CENTRE_VERTICAL);
-    subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL);
-                  
+
+#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
+
+#ifdef __WXMSW__
+    #define BTN_BORDER 4
+    // FIXME - why is this needed? There's some reason why sunken border is
+    //         ignored by sizers in wxMSW but not in wxGTK that I can't
+    //         figure out...
+#else
+    #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->Show(FALSE);
+    if (!(m_style & wxEL_ALLOW_NEW))
+        m_bNew->Show(FALSE);
+    if (!(m_style & wxEL_ALLOW_DELETE))
+        m_bDel->Show(FALSE);
+
+    subsizer->Add(m_bUp, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
+    subsizer->Add(m_bDown, 0, wxALIGN_CENTRE_VERTICAL | wxTOP | wxBOTTOM, BTN_BORDER);
+
     subp->SetAutoLayout(TRUE);
     subp->SetSizer(subsizer);
     subsizer->Fit(subp);
-    
+
     sizer->Add(subp, 0, wxEXPAND);
-    m_listCtrl = new CleverListCtrl(this, wxID_ELD_LISTCTRL, 
-                                    wxDefaultPosition, wxDefaultSize,
-                                    wxLC_REPORT | wxLC_NO_HEADER | 
-                                    wxLC_SINGLE_SEL | wxSUNKEN_BORDER |
-                                                                       wxLC_EDIT_LABELS);
+
+    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,
+                                    wxDefaultPosition, wxDefaultSize, st);
     wxArrayString empty_ar;
     SetStrings(empty_ar);
-    
+
     sizer->Add(m_listCtrl, 1, wxEXPAND);
 
     SetAutoLayout(TRUE);
     SetSizer(sizer);
-       Layout();
+    Layout();
 }
 
 void wxEditableListBox::SetStrings(const wxArrayString& strings)
 {
     m_listCtrl->DeleteAllItems();
     size_t 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(), _T(""));
     m_listCtrl->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 
@@ -171,13 +201,15 @@ void wxEditableListBox::OnItemSelected(wxListEvent& event)
     m_selection = event.GetIndex();
     m_bUp->Enable(m_selection != 0 && m_selection < m_listCtrl->GetItemCount()-1);
     m_bDown->Enable(m_selection < m_listCtrl->GetItemCount()-2);
-    m_bEdit->Enable(m_selection < m_listCtrl->GetItemCount()-1);
-    m_bDel->Enable(m_selection < m_listCtrl->GetItemCount()-1);
+    if (m_style & wxEL_ALLOW_EDIT)
+        m_bEdit->Enable(m_selection < m_listCtrl->GetItemCount()-1);
+    if (m_style & wxEL_ALLOW_DELETE)
+        m_bDel->Enable(m_selection < m_listCtrl->GetItemCount()-1);
 }
 
 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);
     m_edittingNew = TRUE;
     m_listCtrl->EditLabel(m_selection);
@@ -196,7 +228,7 @@ void wxEditableListBox::OnEndLabelEdit(wxListEvent& event)
 void wxEditableListBox::OnDelItem(wxCommandEvent& event)
 {
     m_listCtrl->DeleteItem(m_selection);
-    m_listCtrl->SetItemState(m_selection, 
+    m_listCtrl->SetItemState(m_selection,
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 
@@ -208,7 +240,7 @@ void wxEditableListBox::OnEditItem(wxCommandEvent& event)
 void wxEditableListBox::OnUpItem(wxCommandEvent& event)
 {
     wxString t1, t2;
-    
+
     t1 = m_listCtrl->GetItemText(m_selection - 1);
     t2 = m_listCtrl->GetItemText(m_selection);
     m_listCtrl->SetItemText(m_selection - 1, t2);
@@ -220,7 +252,7 @@ void wxEditableListBox::OnUpItem(wxCommandEvent& event)
 void wxEditableListBox::OnDownItem(wxCommandEvent& event)
 {
     wxString t1, t2;
-    
+
     t1 = m_listCtrl->GetItemText(m_selection + 1);
     t2 = m_listCtrl->GetItemText(m_selection);
     m_listCtrl->SetItemText(m_selection + 1, t2);