Use real id for wxPGCanvas

[wxWidgets.git] / src / osx / carbon / listctrl_mac.cpp

diff --git a/src/osx/carbon/listctrl_mac.cpp b/src/osx/carbon/listctrl_mac.cpp
index 13a20ac2200f4318dde07d23c6fc9c052949c3d8..034b4d073d7b380c7de44684216b8cec9782273e 100644 (file)
--- a/src/osx/carbon/listctrl_mac.cpp
+++ b/src/osx/carbon/listctrl_mac.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/listctrl_mac.cpp
+// Name:        src/osx/listctrl_mac.cpp

 // Purpose:     wxListCtrl
 // Author:      Julian Smart
 // Modified by: Agron Selimaj
 // Purpose:     wxListCtrl
 // Author:      Julian Smart
 // Modified by: Agron Selimaj


@@ -33,7 +33,7 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"

 
 #include "wx/imaglist.h"
 #include "wx/sysopt.h"
 
 #include "wx/imaglist.h"
 #include "wx/sysopt.h"


@@ -148,7 +148,10 @@ static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler ,
                 if (result == kControlButtonPart){
                     DataBrowserPropertyID col;
                     GetDataBrowserSortProperty(controlRef, &col);
                 if (result == kControlButtonPart){
                     DataBrowserPropertyID col;
                     GetDataBrowserSortProperty(controlRef, &col);

-                    int column = col - kMinColumnId;
+
+                    DataBrowserTableViewColumnIndex column = 0;
+                    verify_noerr( GetDataBrowserTableViewColumnPosition( controlRef, col, &column ) );
+

                     le.m_col = column;
                     // FIXME: we can't use the sort property for virtual listctrls
                     // so we need to find a better way to determine which column was clicked...
                     le.m_col = column;
                     // FIXME: we can't use the sort property for virtual listctrls
                     // so we need to find a better way to determine which column was clicked...


@@ -176,7 +179,7 @@ static pascal OSStatus wxMacListCtrlEventHandler( EventHandlerCallRef handler ,
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacListCtrlEventHandler )
 
 
 DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacListCtrlEventHandler )
 

-class wxMacListCtrlItem : public wxMacListBoxItem
+class wxMacListCtrlItem : public wxMacDataItem

 {
 public:
     wxMacListCtrlItem();
 {
 public:
     wxMacListCtrlItem();


@@ -214,8 +217,6 @@ public:
 
     // create a list item (can be a subclass of wxMacListBoxItem)
 
 
     // create a list item (can be a subclass of wxMacListBoxItem)
 

-    virtual wxMacDataItem* CreateItem();
-

     virtual void MacInsertItem( unsigned int n, wxListItem* item );
     virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item );
     virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item );
     virtual void MacInsertItem( unsigned int n, wxListItem* item );
     virtual void MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item );
     virtual void MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item );


@@ -299,6 +300,9 @@ wxMacListCtrlEventDelegate::wxMacListCtrlEventDelegate( wxListCtrl* list, int id
 
 bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
 {
 
 bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
 {

+    int id = event.GetId();
+    wxObject* obj = event.GetEventObject();
+

     // even though we use a generic list ctrl underneath, make sure
     // we present ourselves as wxListCtrl.
     event.SetEventObject( m_list );
     // even though we use a generic list ctrl underneath, make sure
     // we present ourselves as wxListCtrl.
     event.SetEventObject( m_list );


@@ -306,10 +310,20 @@ bool wxMacListCtrlEventDelegate::ProcessEvent( wxEvent& event )
 
     if ( !event.IsKindOf( CLASSINFO( wxCommandEvent ) ) )
     {
 
     if ( !event.IsKindOf( CLASSINFO( wxCommandEvent ) ) )
     {

-        if (m_list->HandleWindowEvent( event ))
+        if (m_list->GetEventHandler()->ProcessEvent( event ))
+        {
+            event.SetId(id);
+            event.SetEventObject(obj);

             return true;
             return true;

+        }

     }
     }

-    return wxEvtHandler::ProcessEvent(event);
+    // Also try with the original id
+    bool success = wxEvtHandler::ProcessEvent(event);
+    event.SetId(id);
+    event.SetEventObject(obj);
+    if (!success && id != m_id)
+        success = wxEvtHandler::ProcessEvent(event);
+    return success;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -481,7 +495,7 @@ void wxListCtrlTextCtrlWrapper::OnKeyUp( wxKeyEvent &event )
     wxPoint myPos = m_text->GetPosition();
     wxSize mySize = m_text->GetSize();
     int sx, sy;
     wxPoint myPos = m_text->GetPosition();
     wxSize mySize = m_text->GetSize();
     int sx, sy;

-    m_text->GetTextExtent(m_text->GetValue() + _T("MM"), &sx, &sy);
+    m_text->GetTextExtent(m_text->GetValue() + wxT("MM"), &sx, &sy);

     if (myPos.x + sx > parentSize.x)
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)
     if (myPos.x + sx > parentSize.x)
         sx = parentSize.x - myPos.x;
     if (mySize.x > sx)


@@ -517,10 +531,9 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-wxMacListControl* wxListCtrl::GetPeer() const
+wxMacDataBrowserListCtrlControl* wxListCtrl::GetListPeer() const

 {
 {

-    wxMacDataBrowserListCtrlControl *lb = wxDynamicCast(m_peer,wxMacDataBrowserListCtrlControl);
-    return lb ? wx_static_cast(wxMacListControl*,lb) : 0 ;
+    return dynamic_cast<wxMacDataBrowserListCtrlControl*> ( GetPeer() );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -616,7 +629,8 @@ void wxListCtrl::OnLeftDown(wxMouseEvent& event)
 
 void wxListCtrl::OnDblClick(wxMouseEvent& event)
 {
 
 void wxListCtrl::OnDblClick(wxMouseEvent& event)
 {

-    m_current = -1;
+    if ( m_renameTimer->IsRunning() )
+        m_renameTimer->Stop();

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -656,21 +670,21 @@ void wxListCtrl::FireMouseEvent(wxEventType eventType, wxPoint position)
 void wxListCtrl::OnChar(wxKeyEvent& event)
 {
 
 void wxListCtrl::OnChar(wxKeyEvent& event)
 {
 

-    
+

     if (m_dbImpl)
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
         le.SetEventObject(this);
         le.m_code = event.GetKeyCode();
         le.m_itemIndex = -1;
     if (m_dbImpl)
     {
         wxListEvent le( wxEVT_COMMAND_LIST_KEY_DOWN, GetId() );
         le.SetEventObject(this);
         le.m_code = event.GetKeyCode();
         le.m_itemIndex = -1;

-        
+

         if (m_current == -1)
         {
             // if m_current isn't set, check if there's been a selection
             // made before continuing
             m_current = GetNextItem(-1, wxLIST_NEXT_BELOW, wxLIST_STATE_SELECTED);
         }
         if (m_current == -1)
         {
             // if m_current isn't set, check if there's been a selection
             // made before continuing
             m_current = GetNextItem(-1, wxLIST_NEXT_BELOW, wxLIST_STATE_SELECTED);
         }

-        
+

         // We need to determine m_current ourselves when navigation keys
         // are used. Note that PAGEUP and PAGEDOWN do not alter the current
         // item on native Mac ListCtrl, so we only handle up and down keys.
         // We need to determine m_current ourselves when navigation keys
         // are used. Note that PAGEUP and PAGEDOWN do not alter the current
         // item on native Mac ListCtrl, so we only handle up and down keys.


@@ -681,7 +695,7 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
                     m_current -= 1;
                 else
                     m_current = 0;
                     m_current -= 1;
                 else
                     m_current = 0;

-                    
+

                 break;
 
             case WXK_DOWN:
                 break;
 
             case WXK_DOWN:


@@ -689,7 +703,7 @@ void wxListCtrl::OnChar(wxKeyEvent& event)
                     m_current += 1;
                 else
                     m_current = GetItemCount() - 1;
                     m_current += 1;
                 else
                     m_current = GetItemCount() - 1;

-                    
+

                 break;
         }
 
                 break;
         }
 


@@ -771,7 +785,7 @@ wxListCtrl::~wxListCtrl()
         delete m_imageListState;
 
     delete m_renameTimer;
         delete m_imageListState;
 
     delete m_renameTimer;

-    
+

     WX_CLEAR_LIST(wxColumnList, m_colsInfo);
 }
 
     WX_CLEAR_LIST(wxColumnList, m_colsInfo);
 }
 


@@ -783,7 +797,7 @@ wxListCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );
 
     attr.colFg = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
     attr.colBg = wxSystemSettings::GetColour( wxSYS_COLOUR_LISTBOX );

-    attr.font.MacCreateFromThemeFont(kThemeViewsFont);
+    attr.font.CreateSystemFont(wxOSX_SYSTEM_FONT_VIEWS);

 
     return attr;
 }
 
     return attr;
 }


@@ -894,7 +908,7 @@ bool wxListCtrl::SetBackgroundColour(const wxColour& colour)
     return rv;
 }
 
     return rv;
 }
 

-wxColour wxListCtrl::GetBackgroundColour()
+wxColour wxListCtrl::GetBackgroundColour() const

 {
     if (m_genericImpl)
         return m_genericImpl->GetBackgroundColour();
 {
     if (m_genericImpl)
         return m_genericImpl->GetBackgroundColour();


@@ -919,7 +933,7 @@ bool wxListCtrl::GetColumn(int col, wxListItem& item) const
     if (m_dbImpl)
     {
         wxColumnList::compatibility_iterator node = m_colsInfo.Item( col );
     if (m_dbImpl)
     {
         wxColumnList::compatibility_iterator node = m_colsInfo.Item( col );

-        wxASSERT_MSG( node, _T("invalid column index in wxMacListCtrlItem") );
+        wxASSERT_MSG( node, wxT("invalid column index in wxMacListCtrlItem") );

         wxListItem* column = node->GetData();
 
         long mask = column->GetMask();
         wxListItem* column = node->GetData();
 
         long mask = column->GetMask();


@@ -948,13 +962,9 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
 
     if (m_dbImpl)
     {
 
     if (m_dbImpl)
     {

+        wxASSERT_MSG( col < (int)m_colsInfo.GetCount(), wxT("invalid column index in wxMacListCtrlItem") );
+

         long mask = item.GetMask();
         long mask = item.GetMask();

-        if ( col >= (int)m_colsInfo.GetCount() )
-        {
-            wxListItem* listItem = new wxListItem(item);
-            m_colsInfo.Append( listItem );
-        }
-        else

         {
             wxListItem listItem;
             GetColumn( col, listItem );
         {
             wxListItem listItem;
             GetColumn( col, listItem );


@@ -976,7 +986,10 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
         // change the appearance in the databrowser.
         DataBrowserListViewHeaderDesc columnDesc;
         columnDesc.version=kDataBrowserListViewLatestHeaderDesc;
         // change the appearance in the databrowser.
         DataBrowserListViewHeaderDesc columnDesc;
         columnDesc.version=kDataBrowserListViewLatestHeaderDesc;

-        verify_noerr( m_dbImpl->GetHeaderDesc( kMinColumnId + col, &columnDesc ) );
+
+        DataBrowserTableViewColumnID id = 0;
+        verify_noerr( m_dbImpl->GetColumnIDFromIndex( col, &id ) );
+        verify_noerr( m_dbImpl->GetHeaderDesc( id, &columnDesc ) );

 
         /*
         if (item.GetMask() & wxLIST_MASK_TEXT)
 
         /*
         if (item.GetMask() & wxLIST_MASK_TEXT)


@@ -1006,7 +1019,7 @@ bool wxListCtrl::SetColumn(int col, wxListItem& item)
             }
         }
 
             }
         }
 

-        verify_noerr( m_dbImpl->SetHeaderDesc( kMinColumnId + col, &columnDesc ) );
+        verify_noerr( m_dbImpl->SetHeaderDesc( id, &columnDesc ) );

 
     }
     return true;
 
     }
     return true;


@@ -1129,6 +1142,8 @@ bool wxListCtrl::GetItem(wxListItem& info) const
             if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
             {
                 m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);
             if (info.m_itemId >= 0 && info.m_itemId < GetItemCount())
             {
                 m_dbImpl->MacGetColumnInfo(info.m_itemId, info.m_col, info);

+                // MacGetColumnInfo returns erroneous information in the state field, so zero it.
+                info.SetState(0);

                 if (info.GetMask() & wxLIST_MASK_STATE)
                 {
                     DataBrowserItemID id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(info.m_itemId);
                 if (info.GetMask() & wxLIST_MASK_STATE)
                 {
                     DataBrowserItemID id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(info.m_itemId);


@@ -1377,7 +1392,7 @@ bool wxListCtrl::SetItemPtrData(long item, wxUIntPtr data)
 wxRect wxListCtrl::GetViewRect() const
 {
     wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST),
 wxRect wxListCtrl::GetViewRect() const
 {
     wxASSERT_MSG( !HasFlag(wxLC_REPORT | wxLC_LIST),

-                    _T("wxListCtrl::GetViewRect() only works in icon mode") );
+                    wxT("wxListCtrl::GetViewRect() only works in icon mode") );

 
     if (m_genericImpl)
         return m_genericImpl->GetViewRect();
 
     if (m_genericImpl)
         return m_genericImpl->GetViewRect();


@@ -1386,6 +1401,15 @@ wxRect wxListCtrl::GetViewRect() const
     return rect;
 }
 
     return rect;
 }
 

+bool wxListCtrl::GetSubItemRect( long item, long subItem, wxRect& rect, int code ) const
+{
+    if (m_genericImpl)
+        return m_genericImpl->GetSubItemRect(item, subItem, rect, code);
+
+    // TODO: implement for DataBrowser implementation
+    return false;
+}
+

 // Gets the item rectangle
 bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
 {
 // Gets the item rectangle
 bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
 {


@@ -1396,7 +1420,10 @@ bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
     if (m_dbImpl)
     {
         DataBrowserItemID id;
     if (m_dbImpl)
     {
         DataBrowserItemID id;

-        DataBrowserPropertyID col = kMinColumnId;
+
+        DataBrowserTableViewColumnID col = 0;
+        verify_noerr( m_dbImpl->GetColumnIDFromIndex( 0, &col ) );
+

         Rect bounds;
         DataBrowserPropertyPart part = kDataBrowserPropertyEnclosingPart;
         if ( code == wxLIST_RECT_LABEL )
         Rect bounds;
         DataBrowserPropertyPart part = kDataBrowserPropertyEnclosingPart;
         if ( code == wxLIST_RECT_LABEL )


@@ -1643,6 +1670,9 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
 
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
 

+                if ( (state & wxLIST_STATE_FOCUSED) && (m_current == line))
+                    return line;
+

                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
 
                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
 


@@ -1663,6 +1693,9 @@ long wxListCtrl::GetNextItem(long item, int geom, int state) const
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
 
                 if ( !IsVirtual() )
                     id = (DataBrowserItemID)m_dbImpl->GetItemFromLine(line);
 

+                if ( (state & wxLIST_STATE_FOCUSED) && (m_current == line))
+                    return line;
+

                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
 
                 if ( (state == wxLIST_STATE_DONTCARE ) )
                     return line;
 


@@ -1774,6 +1807,7 @@ bool wxListCtrl::DeleteItem(long item)
 // Deletes all items
 bool wxListCtrl::DeleteAllItems()
 {
 // Deletes all items
 bool wxListCtrl::DeleteAllItems()
 {

+    m_current = -1;

     if (m_genericImpl)
         return m_genericImpl->DeleteAllItems();
 
     if (m_genericImpl)
         return m_genericImpl->DeleteAllItems();
 


@@ -1877,7 +1911,11 @@ bool wxListCtrl::EndEditLabel(bool WXUNUSED(cancel))
         return true; // m_genericImpl->EndEditLabel(cancel);
 
     if (m_dbImpl)
         return true; // m_genericImpl->EndEditLabel(cancel);
 
     if (m_dbImpl)

-        verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), kDataBrowserNoItem, kMinColumnId) );
+    {
+        DataBrowserTableViewColumnID id = 0;
+        verify_noerr( m_dbImpl->GetColumnIDFromIndex( 0, &id ) );
+        verify_noerr( SetDataBrowserEditItem(m_dbImpl->GetControlRef(), kDataBrowserNoItem, id ) );
+    }

     return true;
 }
 
     return true;
 }
 


@@ -2038,7 +2076,7 @@ int wxListCtrl::GetScrollPos(int orient) const
 // -1 otherwise.
 long wxListCtrl::InsertItem(wxListItem& info)
 {
 // -1 otherwise.
 long wxListCtrl::InsertItem(wxListItem& info)
 {

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

 
     if (m_genericImpl)
         return m_genericImpl->InsertItem(info);
 
     if (m_genericImpl)
         return m_genericImpl->InsertItem(info);


@@ -2132,6 +2170,9 @@ long wxListCtrl::InsertColumn(long col, wxListItem& item)
                 just = teFlushRight;
         }
         m_dbImpl->InsertColumn(col, type, item.GetText(), just, width);
                 just = teFlushRight;
         }
         m_dbImpl->InsertColumn(col, type, item.GetText(), just, width);

+
+        wxListItem* listItem = new wxListItem(item);
+        m_colsInfo.Insert( col, listItem );

         SetColumn(col, item);
 
         // set/remove options based on the wxListCtrl type.
         SetColumn(col, item);
 
         // set/remove options based on the wxListCtrl type.


@@ -2187,7 +2228,7 @@ bool wxListCtrl::ScrollList(int dx, int dy)
 }
 
 
 }
 
 

-bool wxListCtrl::SortItems(wxListCtrlCompare fn, long data)
+bool wxListCtrl::SortItems(wxListCtrlCompare fn, wxIntPtr data)

 {
     if (m_genericImpl)
         return m_genericImpl->SortItems(fn, data);
 {
     if (m_genericImpl)
         return m_genericImpl->SortItems(fn, data);


@@ -2248,7 +2289,7 @@ wxString wxListCtrl::OnGetItemText(long WXUNUSED(item), long WXUNUSED(col)) cons
 {
     // 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("wxListCtrl::OnGetItemText not supposed to be called") );
+    wxFAIL_MSG( wxT("wxListCtrl::OnGetItemText not supposed to be called") );

 
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }


@@ -2272,7 +2313,7 @@ int wxListCtrl::OnGetItemColumnImage(long item, long column) const
 wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
 {
     wxASSERT_MSG( item >= 0 && item < GetItemCount(),
 wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) const
 {
     wxASSERT_MSG( item >= 0 && item < GetItemCount(),

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

 
     // no attributes by default
     return NULL;
 
     // no attributes by default
     return NULL;


@@ -2280,7 +2321,7 @@ wxListItemAttr *wxListCtrl::OnGetItemAttr(long WXUNUSED_UNLESS_DEBUG(item)) cons
 
 void wxListCtrl::SetItemCount(long count)
 {
 
 void wxListCtrl::SetItemCount(long count)
 {

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

 
     if (m_genericImpl)
     {
 
     if (m_genericImpl)
     {


@@ -2433,11 +2474,6 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
     // we want to depend on as little as possible to make sure tear-down of controls is safe
     if ( message == kDataBrowserItemRemoved)
     {
     // we want to depend on as little as possible to make sure tear-down of controls is safe
     if ( message == kDataBrowserItemRemoved)
     {

-        if ( lb != NULL && lb->GetClientDataType() == wxClientData_Object )
-        {
-            delete (wxClientData*) (m_data);
-        }
-

         delete this;
         return;
     }
         delete this;
         return;
     }


@@ -2448,7 +2484,7 @@ void wxMacListCtrlItem::Notification(wxMacDataItemBrowserControl *owner ,
         return  ;
     }
 
         return  ;
     }
 

-    wxListCtrl *list = wxDynamicCast( owner->GetPeer() , wxListCtrl );
+    wxListCtrl *list = wxDynamicCast( owner->GetWXPeer() , wxListCtrl );

     if ( list && lb )
     {
         bool trigger = false;
     if ( list && lb )
     {
         bool trigger = false;


@@ -2667,9 +2703,11 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     wxString text;
     wxFont font = wxNullFont;
     int imgIndex = -1;
     wxString text;
     wxFont font = wxNullFont;
     int imgIndex = -1;

-    short listColumn = property - kMinColumnId;

 
 

-    wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+    DataBrowserTableViewColumnIndex listColumn = 0;
+    GetColumnPosition( property, &listColumn );
+
+    wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );

     wxMacListCtrlItem* lcItem;
     wxColour color = *wxBLACK;
     wxColour bgColor = wxNullColour;
     wxMacListCtrlItem* lcItem;
     wxColour color = *wxBLACK;
     wxColour bgColor = wxNullColour;


@@ -2679,7 +2717,8 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         if (!m_isVirtual)
         {
             lcItem = (wxMacListCtrlItem*) itemID;
         if (!m_isVirtual)
         {
             lcItem = (wxMacListCtrlItem*) itemID;

-            if (lcItem->HasColumnInfo(listColumn)){
+            if (lcItem->HasColumnInfo(listColumn))
+            {

                 wxListItem* item = lcItem->GetColumnInfo(listColumn);
 
                 // we always use the 0 column to get font and text/background colors.
                 wxListItem* item = lcItem->GetColumnInfo(listColumn);
 
                 // we always use the 0 column to get font and text/background colors.


@@ -2829,7 +2868,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
     HIThemeTextHorizontalFlush hFlush = kHIThemeTextHorizontalFlushLeft;
     HIThemeTextInfo info;
     bool setup = false;
     HIThemeTextHorizontalFlush hFlush = kHIThemeTextHorizontalFlushLeft;
     HIThemeTextInfo info;
     bool setup = false;

-#if wxMAC_USE_CORE_TEXT
+#if wxOSX_USE_CORE_TEXT

     if ( UMAGetSystemVersion() >= 0x1050 )
     {
         info.version = kHIThemeTextInfoVersionOne;
     if ( UMAGetSystemVersion() >= 0x1050 )
     {
         info.version = kHIThemeTextInfoVersionOne;


@@ -2837,12 +2876,12 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         if (font.Ok())
         {
             info.fontID = kThemeSpecifiedFont;
         if (font.Ok())
         {
             info.fontID = kThemeSpecifiedFont;

-            info.font = (CTFontRef) font.MacGetCTFont();
+            info.font = (CTFontRef) font.OSXGetCTFont();

             setup = true;
         }
     }
 #endif
             setup = true;
         }
     }
 #endif

-#if wxMAC_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT

     if ( !setup )
     {
         info.version = kHIThemeTextInfoVersionZero;
     if ( !setup )
     {
         info.version = kHIThemeTextInfoVersionZero;


@@ -2852,7 +2891,7 @@ void wxMacDataBrowserListCtrlControl::DrawItem(
         {
             info.fontID = font.MacGetThemeFontID();
 
         {
             info.fontID = font.MacGetThemeFontID();
 

-            ::TextSize( (short)(font.MacGetFontSize()) ) ;
+            ::TextSize( (short)(font.GetPointSize()) ) ;

             ::TextFace( font.MacGetFontStyle() ) ;
         }
     }
             ::TextFace( font.MacGetFontStyle() ) ;
         }
     }


@@ -2902,10 +2941,12 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
 {
     wxString text;
     int imgIndex = -1;
 {
     wxString text;
     int imgIndex = -1;

-    short listColumn = property - kMinColumnId;
+
+    DataBrowserTableViewColumnIndex listColumn = 0;
+    verify_noerr( GetColumnPosition( property, &listColumn ) );

 
     OSStatus err = errDataBrowserPropertyNotSupported;
 
     OSStatus err = errDataBrowserPropertyNotSupported;

-    wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+    wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );

     wxMacListCtrlItem* lcItem = NULL;
 
     if (listColumn >= 0)
     wxMacListCtrlItem* lcItem = NULL;
 
     if (listColumn >= 0)


@@ -2976,7 +3017,8 @@ OSStatus wxMacDataBrowserListCtrlControl::GetSetItemData(DataBrowserItemID itemI
              default:
                 if ( property >= kMinColumnId )
                 {
              default:
                 if ( property >= kMinColumnId )
                 {

-                    short listColumn = property - kMinColumnId;
+                    DataBrowserTableViewColumnIndex listColumn = 0;
+                    verify_noerr( GetColumnPosition( property, &listColumn ) );

 
                     // TODO probably send the 'end edit' from here, as we
                     // can then deal with the veto
 
                     // TODO probably send the 'end edit' from here, as we
                     // can then deal with the veto


@@ -3007,7 +3049,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
     {
         item = (wxMacListCtrlItem *) itemID;
     }
     {
         item = (wxMacListCtrlItem *) itemID;
     }

-    
+

     // we want to depend on as little as possible to make sure tear-down of controls is safe
     if ( message == kDataBrowserItemRemoved )
     {
     // we want to depend on as little as possible to make sure tear-down of controls is safe
     if ( message == kDataBrowserItemRemoved )
     {


@@ -3024,7 +3066,7 @@ void wxMacDataBrowserListCtrlControl::ItemNotification(DataBrowserItemID itemID,
         return  ;
     }
 
         return  ;
     }
 

-    wxListCtrl *list = wxDynamicCast( GetPeer() , wxListCtrl );
+    wxListCtrl *list = wxDynamicCast( GetWXPeer() , wxListCtrl );

     if ( list )
     {
         bool trigger = false;
     if ( list )
     {
         bool trigger = false;


@@ -3100,9 +3142,10 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
     long itemOrder;
     long otherItemOrder;
 
     long itemOrder;
     long otherItemOrder;
 

-    int colId = sortProperty - kMinColumnId;
+    DataBrowserTableViewColumnIndex colId = 0;
+    verify_noerr( GetColumnPosition( sortProperty, &colId ) );

 
 

-    wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+    wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );

 
     DataBrowserSortOrder sort;
     verify_noerr(GetSortOrder(&sort));
 
     DataBrowserSortOrder sort;
     verify_noerr(GetSortOrder(&sort));


@@ -3115,11 +3158,12 @@ Boolean wxMacDataBrowserListCtrlControl::CompareItems(DataBrowserItemID itemOneI
             wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID;
 
             itemOrder = item->GetOrder();
             wxMacListCtrlItem* otherItem = (wxMacListCtrlItem*)itemTwoID;
 
             itemOrder = item->GetOrder();

-            otherItemOrder = item->GetOrder();
+            otherItemOrder = otherItem->GetOrder();

 
             wxListCtrlCompare func = list->GetCompareFunc();
             if (func != NULL)
             {
 
             wxListCtrlCompare func = list->GetCompareFunc();
             if (func != NULL)
             {

+

                 long item1 = -1;
                 long item2 = -1;
                 if (item && item->HasColumnInfo(0))
                 long item1 = -1;
                 long item2 = -1;
                 if (item && item->HasColumnInfo(0))


@@ -3166,16 +3210,16 @@ wxMacDataBrowserListCtrlControl::~wxMacDataBrowserListCtrlControl()
 void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item )
 {
     wxMacDataItem* dataItem = GetItemFromLine(row);
 void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsigned int column, wxListItem* item )
 {
     wxMacDataItem* dataItem = GetItemFromLine(row);

-    wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem for row in MacSetColumnInfo. Is row a valid wxListCtrl row?") );
+    wxASSERT_MSG( dataItem, wxT("could not obtain wxMacDataItem for row in MacSetColumnInfo. Is row a valid wxListCtrl row?") );

     if (item)
     {
     if (item)
     {

-        wxMacListCtrlItem* listItem = wx_static_cast(wxMacListCtrlItem*,dataItem);
+        wxMacListCtrlItem* listItem = static_cast<wxMacListCtrlItem *>(dataItem);

         bool hasInfo = listItem->HasColumnInfo( column );
         listItem->SetColumnInfo( column, item );
         listItem->SetOrder(row);
         UpdateState(dataItem, item);
 
         bool hasInfo = listItem->HasColumnInfo( column );
         listItem->SetColumnInfo( column, item );
         listItem->SetOrder(row);
         UpdateState(dataItem, item);
 

-        wxListCtrl* list = wxDynamicCast( GetPeer() , wxListCtrl );
+        wxListCtrl* list = wxDynamicCast( GetWXPeer() , wxListCtrl );

 
         // NB: When this call was made before a control was completely shown, it would
         // update the item prematurely (i.e. no text would be listed) and, on show,
 
         // NB: When this call was made before a control was completely shown, it would
         // update the item prematurely (i.e. no text would be listed) and, on show,


@@ -3183,7 +3227,11 @@ void wxMacDataBrowserListCtrlControl::MacSetColumnInfo( unsigned int row, unsign
         // would be shown. Making sure not to update items until the control is visible
         // seems to fix this issue.
         if (hasInfo && list->IsShown())
         // would be shown. Making sure not to update items until the control is visible
         // seems to fix this issue.
         if (hasInfo && list->IsShown())

-            UpdateItem( wxMacDataBrowserRootContainer, listItem , kMinColumnId + column );
+        {
+            DataBrowserTableViewColumnID id = 0;
+            verify_noerr( GetColumnIDFromIndex( column, &id ) );
+            UpdateItem( wxMacDataBrowserRootContainer, listItem , id );
+        }

     }
 }
 
     }
 }
 


@@ -3208,11 +3256,11 @@ void wxMacDataBrowserListCtrlControl::UpdateState(wxMacDataItem* dataItem, wxLis
 void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item )
 {
     wxMacDataItem* dataItem = GetItemFromLine(row);
 void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsigned int column, wxListItem& item )
 {
     wxMacDataItem* dataItem = GetItemFromLine(row);

-    wxASSERT_MSG( dataItem, _T("could not obtain wxMacDataItem in MacGetColumnInfo. Is row a valid wxListCtrl row?") );
+    wxASSERT_MSG( dataItem, wxT("could not obtain wxMacDataItem in MacGetColumnInfo. Is row a valid wxListCtrl row?") );

     // CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate
     //if (item)
     {
     // CS should this guard against dataItem = 0 ? , as item is not a pointer if (item) is not appropriate
     //if (item)
     {

-        wxMacListCtrlItem* listItem =wx_static_cast(wxMacListCtrlItem*,dataItem);
+        wxMacListCtrlItem* listItem = static_cast<wxMacListCtrlItem *>(dataItem);

 
         if (!listItem->HasColumnInfo( column ))
             return;
 
         if (!listItem->HasColumnInfo( column ))
             return;


@@ -3248,13 +3296,9 @@ void wxMacDataBrowserListCtrlControl::MacGetColumnInfo( unsigned int row, unsign
 
 void wxMacDataBrowserListCtrlControl::MacInsertItem( unsigned int n, wxListItem* item )
 {
 
 void wxMacDataBrowserListCtrlControl::MacInsertItem( unsigned int n, wxListItem* item )
 {

-    wxMacDataItemBrowserControl::MacInsert(n, item->GetText());
-    MacSetColumnInfo(n, 0, item);
-}

 
 

-wxMacDataItem* wxMacDataBrowserListCtrlControl::CreateItem()
-{
-    return new wxMacListCtrlItem();
+    wxMacDataItemBrowserControl::MacInsert(n, new wxMacListCtrlItem() );
+    MacSetColumnInfo(n, 0, item);

 }
 
 wxMacListCtrlItem::wxMacListCtrlItem()
 }
 
 wxMacListCtrlItem::wxMacListCtrlItem()


@@ -3278,9 +3322,10 @@ void wxMacListCtrlItem::SetColumnImageValue( unsigned int column, int imageIndex
 
 wxString wxMacListCtrlItem::GetColumnTextValue( unsigned int column )
 {
 
 wxString wxMacListCtrlItem::GetColumnTextValue( unsigned int column )
 {

+/* TODO CHECK REMOVE

     if ( column == 0 )
         return GetLabel();
     if ( column == 0 )
         return GetLabel();

-
+*/

     if ( HasColumnInfo(column) )
         return GetColumnInfo(column)->GetText();
 
     if ( HasColumnInfo(column) )
         return GetColumnInfo(column)->GetText();
 


@@ -3292,14 +3337,16 @@ void wxMacListCtrlItem::SetColumnTextValue( unsigned int column, const wxString&
     if ( HasColumnInfo(column) )
         GetColumnInfo(column)->SetText(text);
 
     if ( HasColumnInfo(column) )
         GetColumnInfo(column)->SetText(text);
 

+/* TODO CHECK REMOVE

     // for compatibility with superclass APIs
     if ( column == 0 )
         SetLabel(text);
     // for compatibility with superclass APIs
     if ( column == 0 )
         SetLabel(text);

+*/

 }
 
 wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
 {
 }
 
 wxListItem* wxMacListCtrlItem::GetColumnInfo( unsigned int column )
 {

-    wxASSERT_MSG( HasColumnInfo(column), _T("invalid column index in wxMacListCtrlItem") );
+    wxASSERT_MSG( HasColumnInfo(column), wxT("invalid column index in wxMacListCtrlItem") );

     return m_rowItems[column];
 }
 
     return m_rowItems[column];
 }