Fix file paths in wxFileSystemWatcherEvent under OS X.

[wxWidgets.git] / src / os2 / listctrl.cpp

diff --git a/src/os2/listctrl.cpp b/src/os2/listctrl.cpp
index 062a528006c8b96673d23fdd0bc63e55ae91b069..cf9a922745ad94eb873bce1ba172f293bfcf90e7 100644 (file)
--- a/src/os2/listctrl.cpp
+++ b/src/os2/listctrl.cpp
@@ -106,7 +106,7 @@ typedef struct _MYRECORD
 // Problem:
 //  The MSW version had problems with SetTextColour() et al as the
 //  CListItemAttr's were stored keyed on the item index. If a item was
 // Problem:
 //  The MSW version had problems with SetTextColour() et al as the
 //  CListItemAttr's were stored keyed on the item index. If a item was

-//  inserted anywhere but the end of the list the the text attributes
+//  inserted anywhere but the end of the list the text attributes

 //  (colour etc) for the following items were out of sync.
 //
 // Solution:
 //  (colour etc) for the following items were out of sync.
 //
 // Solution:


@@ -140,8 +140,7 @@ public:
 
     ~CListItemInternalData()
     {
 
     ~CListItemInternalData()
     {

-        delete m_pAttr;
-        m_pAttr = NULL;
+        wxDELETE(m_pAttr);

     }
 
     wxListItemAttr*                 m_pAttr;
     }
 
     wxListItemAttr*                 m_pAttr;


@@ -774,13 +773,6 @@ void ConvertToOS2ListCol (
     pField->offStruct = 0;
 } // end of ConvertToOS2ListCol
 
     pField->offStruct = 0;
 } // end of ConvertToOS2ListCol
 

-
-IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxListView, wxListCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxListItem, wxObject)
-
-IMPLEMENT_DYNAMIC_CLASS(wxListEvent, wxNotifyEvent)
-

 BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
     EVT_PAINT(wxListCtrl::OnPaint)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxListCtrl, wxControl)
     EVT_PAINT(wxListCtrl::OnPaint)
 END_EVENT_TABLE()


@@ -965,8 +957,7 @@ wxListCtrl::~wxListCtrl ()
     {
         m_pTextCtrl->SetHWND(0);
         m_pTextCtrl->UnsubclassWin();
     {
         m_pTextCtrl->SetHWND(0);
         m_pTextCtrl->UnsubclassWin();

-        delete m_pTextCtrl;
-        m_pTextCtrl = NULL;
+        wxDELETE(m_pTextCtrl);

     }
 
     if (m_bOwnsImageListNormal)
     }
 
     if (m_bOwnsImageListNormal)


@@ -2256,7 +2247,7 @@ long wxListCtrl::InsertItem (
     vInsert.fInvalidateRecord = TRUE;
 
     //
     vInsert.fInvalidateRecord = TRUE;
 
     //

-    // Check wether we need to allocate our internal data
+    // Check whether we need to allocate our internal data

     //
     bool                            bNeedInternalData = ((rInfo.GetMask() & wxLIST_MASK_DATA) ||
                                                           rInfo.HasAttributes()
     //
     bool                            bNeedInternalData = ((rInfo.GetMask() & wxLIST_MASK_DATA) ||
                                                           rInfo.HasAttributes()