Added missing include and missing underscores

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index c617257fa193ca23a7c974f06240339df5d5d319..33f2e098ce5aa51f4c9a48646bd15d32a94f81fd 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -1646,11 +1646,11 @@ bool wxMacDataItem::IsLessThan(wxMacDataItemBrowserControl *owner ,
     const wxMacDataItem* otherItem = dynamic_cast<const wxMacDataItem*>(rhs);
     bool retval = false;
     
     const wxMacDataItem* otherItem = dynamic_cast<const wxMacDataItem*>(rhs);
     bool retval = false;
     

-    if ( sortProperty == m_colId && owner->GetSortOrder() != SortOrder_None){
+    if ( sortProperty == m_colId ){

         retval = m_label.CmpNoCase( otherItem->m_label) < 0;
     }
     
         retval = m_label.CmpNoCase( otherItem->m_label) < 0;
     }
     

-    else if ( owner->GetSortOrder() == SortOrder_None || sortProperty == kNumericOrderColumnId )
+    else if ( sortProperty == kNumericOrderColumnId )

         retval = m_order < otherItem->m_order;
 
     return retval;
         retval = m_order < otherItem->m_order;
 
     return retval;


@@ -1703,16 +1703,6 @@ wxMacDataItemBrowserControl::wxMacDataItemBrowserControl( wxWindow* peer , const
     m_clientDataItemsType = wxClientData_None;
 }
 
     m_clientDataItemsType = wxClientData_None;
 }
 

-ListSortOrder wxMacDataItemBrowserControl::GetSortOrder() const 
-{
-    return m_sortOrder;
-}
-
-void wxMacDataItemBrowserControl::SetSortOrder(const ListSortOrder sort)
-{
-    m_sortOrder = sort;
-}
-

 wxMacDataItem* wxMacDataItemBrowserControl::CreateItem()
 {
     return new wxMacDataItem();
 wxMacDataItem* wxMacDataItemBrowserControl::CreateItem()
 {
     return new wxMacDataItem();


@@ -1879,8 +1869,8 @@ void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container,
     delete [] items;
 }
 
     delete [] items;
 }
 

-void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType, DataBrowserPropertyFlags flags ,
-                                            const wxString& title, SInt16 just, int minWidth, int maxWidth)
+void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType,
+                                            const wxString& title, SInt16 just, int defaultWidth)

 {
     DataBrowserListViewColumnDesc columnDesc;
     columnDesc.headerBtnDesc.titleOffset = 0;
 {
     DataBrowserListViewColumnDesc columnDesc;
     columnDesc.headerBtnDesc.titleOffset = 0;


@@ -1910,9 +1900,9 @@ void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyTyp
 
     columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
     columnDesc.propertyDesc.propertyType = colType;
 
     columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
     columnDesc.propertyDesc.propertyType = colType;

-    columnDesc.propertyDesc.propertyFlags = flags; 
-#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
-    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewSortableColumn | kDataBrowserListViewTypeSelectColumn; 
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+    columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewNoGapForIconInHeaderButton;

 #endif
 
     verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );
 #endif
 
     verify_noerr( AddColumn( &columnDesc, kDataBrowserListViewAppendColumn ) );