compilation fix for Watcom

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

diff --git a/contrib/src/gizmos/editlbox.cpp b/contrib/src/gizmos/editlbox.cpp
index 28a43fa5d1b27269eebe417cbab0bcf9aba48536..9d20f68546bb1cb5ee2ac7886473576af7d91488 100644 (file)
--- a/contrib/src/gizmos/editlbox.cpp
+++ b/contrib/src/gizmos/editlbox.cpp
@@ -65,6 +65,7 @@ private:
     void OnSize(wxSizeEvent& event)
     {
         SizeColumns();
     void OnSize(wxSizeEvent& event)
     {
         SizeColumns();

+        event.Skip();

     }
 };
 
     }
 };
 


@@ -81,7 +82,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_CLASS(wxEditableListBox, wxPanel)
 
 
 IMPLEMENT_CLASS(wxEditableListBox, wxPanel)
 

-enum 
+enum

 {
     // ID value doesn't matter, it won't propagate out of wxEditableListBox
     // instance
 {
     // ID value doesn't matter, it won't propagate out of wxEditableListBox
     // instance


@@ -105,11 +106,12 @@ END_EVENT_TABLE()
 
 wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
                           const wxString& label,
 
 wxEditableListBox::wxEditableListBox(wxWindow *parent, wxWindowID id,
                           const wxString& label,

-                          const wxPoint& pos, const wxSize& size)
-   : wxPanel(parent, id, pos, size), m_edittingNew(FALSE)
+                          const wxPoint& pos, const wxSize& size,
+                          const wxString& name)
+   : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL, name), m_edittingNew(FALSE)

 {
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
 {
     wxSizer *sizer = new wxBoxSizer(wxVERTICAL);

-    
+

     wxPanel *subp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize,
                                 wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
     wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL);
     wxPanel *subp = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize,
                                 wxSUNKEN_BORDER | wxTAB_TRAVERSAL);
     wxSizer *subsizer = new wxBoxSizer(wxHORIZONTAL);


@@ -119,39 +121,48 @@ 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));
     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));

+
+    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"));
+

     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);
     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);

-                  
+

     subp->SetAutoLayout(TRUE);
     subp->SetSizer(subsizer);
     subsizer->Fit(subp);
     subp->SetAutoLayout(TRUE);
     subp->SetSizer(subsizer);
     subsizer->Fit(subp);

-    
+

     sizer->Add(subp, 0, wxEXPAND);
     sizer->Add(subp, 0, wxEXPAND);

-    m_listCtrl = new CleverListCtrl(this, wxID_ELD_LISTCTRL, 
+    m_listCtrl = new CleverListCtrl(this, wxID_ELD_LISTCTRL,

                                     wxDefaultPosition, wxDefaultSize,
                                     wxDefaultPosition, wxDefaultSize,

-                                    wxLC_REPORT | wxLC_NO_HEADER | 
-                                    wxLC_SINGLE_SEL | wxSUNKEN_BORDER);
+                                    wxLC_REPORT | wxLC_NO_HEADER |
+                                    wxLC_SINGLE_SEL | wxSUNKEN_BORDER |
+                                                                       wxLC_EDIT_LABELS);

     wxArrayString empty_ar;
     SetStrings(empty_ar);
     wxArrayString empty_ar;
     SetStrings(empty_ar);

-    
+

     sizer->Add(m_listCtrl, 1, wxEXPAND);
 
     SetAutoLayout(TRUE);
     SetSizer(sizer);
     sizer->Add(m_listCtrl, 1, wxEXPAND);
 
     SetAutoLayout(TRUE);
     SetSizer(sizer);

+       Layout();

 }
 
 void wxEditableListBox::SetStrings(const wxArrayString& strings)
 {
     m_listCtrl->DeleteAllItems();
     size_t i;
 }
 
 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]);
     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);
 }
 
     m_listCtrl->SetItemState(0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 


@@ -174,7 +185,7 @@ void wxEditableListBox::OnItemSelected(wxListEvent& event)
 
 void wxEditableListBox::OnNewItem(wxCommandEvent& event)
 {
 
 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);
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
     m_edittingNew = TRUE;
     m_listCtrl->EditLabel(m_selection);


@@ -186,17 +197,14 @@ void wxEditableListBox::OnEndLabelEdit(wxListEvent& event)
     {
         m_edittingNew = FALSE;
         if (!event.GetText().IsEmpty())
     {
         m_edittingNew = FALSE;
         if (!event.GetText().IsEmpty())

-        {
-            printf("X-\n");

             m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), _T(""));
             m_listCtrl->InsertItem(m_listCtrl->GetItemCount(), _T(""));

-        }

     }
 }
 
 void wxEditableListBox::OnDelItem(wxCommandEvent& event)
 {
     m_listCtrl->DeleteItem(m_selection);
     }
 }
 
 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);
 }
 
                              wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 


@@ -208,7 +216,7 @@ void wxEditableListBox::OnEditItem(wxCommandEvent& event)
 void wxEditableListBox::OnUpItem(wxCommandEvent& event)
 {
     wxString t1, t2;
 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);
     t1 = m_listCtrl->GetItemText(m_selection - 1);
     t2 = m_listCtrl->GetItemText(m_selection);
     m_listCtrl->SetItemText(m_selection - 1, t2);


@@ -220,7 +228,7 @@ void wxEditableListBox::OnUpItem(wxCommandEvent& event)
 void wxEditableListBox::OnDownItem(wxCommandEvent& event)
 {
     wxString t1, t2;
 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);
     t1 = m_listCtrl->GetItemText(m_selection + 1);
     t2 = m_listCtrl->GetItemText(m_selection);
     m_listCtrl->SetItemText(m_selection + 1, t2);