adapting ownership semantics to cocoa convention

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

diff --git a/src/os2/listctrl.cpp b/src/os2/listctrl.cpp
index 8e7e76cb0438a4bdcf5ff4357f65a41e3582af5d..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;


@@ -702,7 +701,7 @@ void ConvertToOS2ListItem (
                     break;
 
                 default:
                     break;
 
                 default:

-                    wxFAIL_MSG( _T("wxOS2 does not support more than 10 columns in REPORT view") );
+                    wxFAIL_MSG( wxT("wxOS2 does not support more than 10 columns in REPORT view") );

                     break;
             }
         }
                     break;
             }
         }


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

-// ----------------------------------------------------------------------------
-// events
-// ----------------------------------------------------------------------------
-
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_RDRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_END_LABEL_EDIT)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ITEM)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_GET_INFO)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_SET_INFO)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_SELECTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_DESELECTED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_KEY_DOWN)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_INSERT_ITEM)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_DRAGGING)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_COL_END_DRAG)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_ACTIVATED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_ITEM_FOCUSED)
-DEFINE_EVENT_TYPE(wxEVT_COMMAND_LIST_CACHE_HINT)
-
-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()


@@ -991,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)


@@ -1490,7 +1455,7 @@ bool wxListCtrl::SetItemImage (
 bool wxListCtrl::SetItemColumnImage (
   long                              lItem
 , long                              lColumn
 bool wxListCtrl::SetItemColumnImage (
   long                              lItem
 , long                              lColumn

-, int                               nImage
+, int                               nImage)

 {
     wxListItem                      vInfo;
 
 {
     wxListItem                      vInfo;
 


@@ -1545,9 +1510,9 @@ long wxListCtrl::GetItemData (
 } // end of wxListCtrl::GetItemData
 
 // Sets the item data
 } // end of wxListCtrl::GetItemData
 
 // Sets the item data

-bool wxListCtrl::SetItemData (
+bool wxListCtrl::SetItemPtrData (

   long                              lItem
   long                              lItem

-, long                              lData
+, wxUIntPtr                         lData

 )
 {
     wxListItem                      vInfo;
 )
 {
     wxListItem                      vInfo;


@@ -1556,7 +1521,7 @@ bool wxListCtrl::SetItemData (
     vInfo.m_itemId = lItem;
     vInfo.m_data   = lData;
     return SetItem(vInfo);
     vInfo.m_itemId = lItem;
     vInfo.m_data   = lData;
     return SetItem(vInfo);

-} // end of wxListCtrl::SetItemData
+} // end of wxListCtrl::SetItemPtrData

 
 // Gets the item rectangle
 bool wxListCtrl::GetItemRect ( long lItem,
 
 // Gets the item rectangle
 bool wxListCtrl::GetItemRect ( long lItem,


@@ -2168,7 +2133,7 @@ long wxListCtrl::FindItem (
     vLibRect.SetTop(vRect.yTop);
     vLibRect.SetRight(vRect.xRight);
     vLibRect.SetBottom(vRect.yBottom);
     vLibRect.SetTop(vRect.yTop);
     vLibRect.SetRight(vRect.xRight);
     vLibRect.SetBottom(vRect.yBottom);

-    if (vLibRect.Inside(rPoint))
+    if (vLibRect.Contains(rPoint))

         return pRecord->m_ulItemId;
 
     for (i = lStart + 1; i < vCnrInfo.cRecords; i++)
         return pRecord->m_ulItemId;
 
     for (i = lStart + 1; i < vCnrInfo.cRecords; i++)


@@ -2188,7 +2153,7 @@ long wxListCtrl::FindItem (
         vLibRect.SetTop(vRect.yTop);
         vLibRect.SetRight(vRect.xRight);
         vLibRect.SetBottom(vRect.yBottom);
         vLibRect.SetTop(vRect.yTop);
         vLibRect.SetRight(vRect.xRight);
         vLibRect.SetBottom(vRect.yBottom);

-        if (vLibRect.Inside(rPoint))
+        if (vLibRect.Contains(rPoint))

             return pRecord->m_ulItemId;
     }
     return -1L;
             return pRecord->m_ulItemId;
     }
     return -1L;


@@ -2246,7 +2211,7 @@ long wxListCtrl::InsertItem (
   wxListItem&                       rInfo
 )
 {
   wxListItem&                       rInfo
 )
 {

-    wxASSERT_MSG( !IsVirtual(), _T("can't be used with virtual controls") );
+    wxASSERT_MSG( !IsVirtual(), wxT("can't be used with virtual controls") );

 
     PFIELDINFO                      pFieldInfo = FindOS2ListFieldByColNum ( GetHWND()
                                                                            ,rInfo.GetColumn()
 
     PFIELDINFO                      pFieldInfo = FindOS2ListFieldByColNum ( GetHWND()
                                                                            ,rInfo.GetColumn()


@@ -2282,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()


@@ -2466,7 +2431,7 @@ bool wxListCtrl::SortItems ( wxListCtrlCompare fn, long lData )
                       ,(PVOID)&vInternalData
                      ))
     {
                       ,(PVOID)&vInternalData
                      ))
     {

-        wxLogDebug(_T("CM_SORTRECORD failed"));
+        wxLogDebug(wxT("CM_SORTRECORD failed"));

         return false;
     }
     return true;
         return false;
     }
     return true;


@@ -2599,7 +2564,7 @@ wxString wxListCtrl::OnGetItemText (
 {
     // this is a pure virtual function, in fact - which is not really pure
     // because the controls which are not virtual don't need to implement it
 {
     // this is a pure virtual function, in fact - which is not really pure
     // because the controls which are not virtual don't need to implement it

-    wxFAIL_MSG( _T("not supposed to be called") );
+    wxFAIL_MSG( wxT("not supposed to be called") );

     return wxEmptyString;
 } // end of wxListCtrl::OnGetItemText
 
     return wxEmptyString;
 } // end of wxListCtrl::OnGetItemText
 


@@ -2608,7 +2573,7 @@ int wxListCtrl::OnGetItemImage (
 ) const
 {
     // same as above
 ) const
 {
     // same as above

-    wxFAIL_MSG( _T("not supposed to be called") );
+    wxFAIL_MSG( wxT("not supposed to be called") );

     return -1;
 } // end of wxListCtrl::OnGetItemImage
 
     return -1;
 } // end of wxListCtrl::OnGetItemImage
 


@@ -2628,7 +2593,7 @@ wxListItemAttr* wxListCtrl::OnGetItemAttr (
 ) const
 {
     wxASSERT_MSG( lItem >= 0 && lItem < GetItemCount(),
 ) const
 {
     wxASSERT_MSG( lItem >= 0 && lItem < GetItemCount(),

-                  _T("invalid item index in OnGetItemAttr()") );
+                  wxT("invalid item index in OnGetItemAttr()") );

 
     //
     // No attributes by default
 
     //
     // No attributes by default


@@ -2640,7 +2605,7 @@ void wxListCtrl::SetItemCount (
   long                              lCount
 )
 {
   long                              lCount
 )
 {

-    wxASSERT_MSG( IsVirtual(), _T("this is for virtual controls only") );
+    wxASSERT_MSG( IsVirtual(), wxT("this is for virtual controls only") );

 
     //
     // Cannot explicitly set the record count in OS/2
 
     //
     // Cannot explicitly set the record count in OS/2


@@ -2776,7 +2741,7 @@ MRESULT wxListCtrl::OS2WindowProc( WXUINT uMsg,
                     //
             }
             vEvent.SetEventType(vEventType);
                     //
             }
             vEvent.SetEventType(vEventType);

-            bProcessed = GetEventHandler()->ProcessEvent(vEvent);
+            bProcessed = HandleWindowEvent(vEvent);

             break;
     }
     if (!bProcessed)
             break;
     }
     if (!bProcessed)