support underlined text in wxCairoContext (Marcin's patch) (closes #9846)

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

diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp
index 2dd11a6b2eb6f19c1106cca5db5249b07bc988ad..dd3cebff16042060f4c128ac85773d36d14efb00 100644 (file)
--- a/src/osx/carbon/dataview.cpp
+++ b/src/osx/carbon/dataview.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/datavgen.cpp
+// Name:        src/osx/carbon/datavgen.cpp

 // Purpose:     wxDataViewCtrl native mac implementation
 // Purpose:     wxDataViewCtrl native mac implementation

-// Author:      
+// Author:

 // Id:          $Id$
 // Copyright:   (c) 2007
 // Licence:     wxWindows licence
 // Id:          $Id$
 // Copyright:   (c) 2007
 // Licence:     wxWindows licence


@@ -46,7 +46,7 @@ static EventTypeSpec const eventList[] =
 
 static pascal OSStatus wxMacDataViewCtrlEventHandler(EventHandlerCallRef handler, EventRef EventReference, void* Data)
 {
 
 static pascal OSStatus wxMacDataViewCtrlEventHandler(EventHandlerCallRef handler, EventRef EventReference, void* Data)
 {

-  wxDataViewCtrl* DataViewCtrlPtr((wxDataViewCtrl*) Data); // the 'Data' variable always contains a pointer to the data view control that installed the handler 
+  wxDataViewCtrl* DataViewCtrlPtr((wxDataViewCtrl*) Data); // the 'Data' variable always contains a pointer to the data view control that installed the handler

 
   wxMacCarbonEvent CarbonEvent(EventReference) ;
 
 
   wxMacCarbonEvent CarbonEvent(EventReference) ;
 


@@ -61,7 +61,7 @@ static pascal OSStatus wxMacDataViewCtrlEventHandler(EventHandlerCallRef handler
         status = ::CallNextEventHandler(handler,EventReference);
         DataViewCtrlPtr->MacSetDrawingContext(NULL);
         return status;
         status = ::CallNextEventHandler(handler,EventReference);
         DataViewCtrlPtr->MacSetDrawingContext(NULL);
         return status;

-      } /* block */
+      }

     case kEventControlHit :
       if (CarbonEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) == kControlButtonPart) // we only care about the header
       {
     case kEventControlHit :
       if (CarbonEvent.GetParameter<ControlPartCode>(kEventParamControlPart,typeControlPartCode) == kControlButtonPart) // we only care about the header
       {


@@ -84,26 +84,22 @@ static pascal OSStatus wxMacDataViewCtrlEventHandler(EventHandlerCallRef handler
         DataViewEvent.SetColumn(columnIndex);
         DataViewEvent.SetDataViewColumn(DataViewCtrlPtr->GetColumn(columnIndex));
        // finally sent the equivalent wxWidget event:
         DataViewEvent.SetColumn(columnIndex);
         DataViewEvent.SetDataViewColumn(DataViewCtrlPtr->GetColumn(columnIndex));
        // finally sent the equivalent wxWidget event:

-#if wxCHECK_VERSION(2,9,0)

         DataViewCtrlPtr->HandleWindowEvent(DataViewEvent);
         DataViewCtrlPtr->HandleWindowEvent(DataViewEvent);

-#else
-        DataViewCtrlPtr->GetEventHandler()->ProcessEvent(DataViewEvent);
-#endif

         return ::CallNextEventHandler(handler,EventReference);
         return ::CallNextEventHandler(handler,EventReference);

-      } /* if */
+      }

       else
         return eventNotHandledErr;
       else
         return eventNotHandledErr;

-  } /* switch */
+  }

 
   return eventNotHandledErr;
 
   return eventNotHandledErr;

-} /* wxMacDataViewCtrlEventHandler(EventHandlerCallRef, EventRef, void*) */
+}

 
 static DataBrowserItemID* CreateDataBrowserItemIDArray(size_t& noOfEntries, wxDataViewItemArray const& items) // returns a newly allocated pointer to valid data browser item IDs
 {
   size_t const noOfItems = items.GetCount();
 
   DataBrowserItemID* itemIDs(new DataBrowserItemID[noOfItems]);
 
 static DataBrowserItemID* CreateDataBrowserItemIDArray(size_t& noOfEntries, wxDataViewItemArray const& items) // returns a newly allocated pointer to valid data browser item IDs
 {
   size_t const noOfItems = items.GetCount();
 
   DataBrowserItemID* itemIDs(new DataBrowserItemID[noOfItems]);

- 
+

 
  // convert all valid data view items to data browser items
   noOfEntries = 0;
 
  // convert all valid data view items to data browser items
   noOfEntries = 0;


@@ -112,16 +108,12 @@ static DataBrowserItemID* CreateDataBrowserItemIDArray(size_t& noOfEntries, wxDa
     {
       itemIDs[noOfEntries] = reinterpret_cast<DataBrowserItemID>(items[i].GetID());
       ++noOfEntries;
     {
       itemIDs[noOfEntries] = reinterpret_cast<DataBrowserItemID>(items[i].GetID());
       ++noOfEntries;

-    } /* if */
+    }

  // done:
   return itemIDs;
  // done:
   return itemIDs;

-} /* CreateDataBrowserItemIDArray(size_t&, wxDataViewItemArray const&) */
+}

 
 

-#if wxCHECK_VERSION(2,9,0)

 static bool InitializeColumnDescription(DataBrowserListViewColumnDesc& columnDescription, wxDataViewColumn const* columnPtr, DataBrowserPropertyID columnPropertyID, wxCFStringRef const& title)
 static bool InitializeColumnDescription(DataBrowserListViewColumnDesc& columnDescription, wxDataViewColumn const* columnPtr, DataBrowserPropertyID columnPropertyID, wxCFStringRef const& title)

-#else
-static bool InitializeColumnDescription(DataBrowserListViewColumnDesc& columnDescription, wxDataViewColumn const* columnPtr, DataBrowserPropertyID columnPropertyID, wxMacCFStringHolder const& title)
-#endif

 {
  // set properties for the column:
   columnDescription.propertyDesc.propertyID    = columnPropertyID;
 {
  // set properties for the column:
   columnDescription.propertyDesc.propertyID    = columnPropertyID;


@@ -133,12 +125,12 @@ static bool InitializeColumnDescription(DataBrowserListViewColumnDesc& columnDes
   {
     columnDescription.headerBtnDesc.minimumWidth = 0;
     columnDescription.headerBtnDesc.maximumWidth = 30000; // 32767 is the theoretical maximum though but 30000 looks nicer
   {
     columnDescription.headerBtnDesc.minimumWidth = 0;
     columnDescription.headerBtnDesc.maximumWidth = 30000; // 32767 is the theoretical maximum though but 30000 looks nicer

-  } /* if */
+  }

   else
   {
     columnDescription.headerBtnDesc.minimumWidth = columnPtr->GetWidth();
     columnDescription.headerBtnDesc.maximumWidth = columnPtr->GetWidth();
   else
   {
     columnDescription.headerBtnDesc.minimumWidth = columnPtr->GetWidth();
     columnDescription.headerBtnDesc.maximumWidth = columnPtr->GetWidth();

-  } /* if */
+  }

   if (columnPtr->IsSortable())
     columnDescription.propertyDesc.propertyFlags |= kDataBrowserListViewSortableColumn;
   if (columnPtr->GetRenderer()->GetMode() == wxDATAVIEW_CELL_EDITABLE)
   if (columnPtr->IsSortable())
     columnDescription.propertyDesc.propertyFlags |= kDataBrowserListViewSortableColumn;
   if (columnPtr->GetRenderer()->GetMode() == wxDATAVIEW_CELL_EDITABLE)


@@ -171,17 +163,13 @@ static bool InitializeColumnDescription(DataBrowserListViewColumnDesc& columnDes
       break;
     default:
       columnDescription.headerBtnDesc.btnFontStyle.just = teFlushDefault;
       break;
     default:
       columnDescription.headerBtnDesc.btnFontStyle.just = teFlushDefault;

-  } /* switch */
+  }

   columnDescription.headerBtnDesc.btnFontStyle.font  = kControlFontViewSystemFont;
   columnDescription.headerBtnDesc.btnFontStyle.style = normal;
   if (columnPtr->GetBitmap().IsOk())
   {
     columnDescription.headerBtnDesc.btnContentInfo.contentType = kControlContentIconRef;
   columnDescription.headerBtnDesc.btnFontStyle.font  = kControlFontViewSystemFont;
   columnDescription.headerBtnDesc.btnFontStyle.style = normal;
   if (columnPtr->GetBitmap().IsOk())
   {
     columnDescription.headerBtnDesc.btnContentInfo.contentType = kControlContentIconRef;

-#if wxCHECK_VERSION(2,9,0)

     columnDescription.headerBtnDesc.btnContentInfo.u.iconRef = columnPtr->GetBitmap().GetIconRef();
     columnDescription.headerBtnDesc.btnContentInfo.u.iconRef = columnPtr->GetBitmap().GetIconRef();

-#else
-    columnDescription.headerBtnDesc.btnContentInfo.u.iconRef = columnPtr->GetBitmap().GetBitmapData()->GetIconRef();
-#endif

   }
   else
   {
   }
   else
   {


@@ -190,10 +178,10 @@ static bool InitializeColumnDescription(DataBrowserListViewColumnDesc& columnDes
     columnDescription.headerBtnDesc.btnContentInfo.contentType = kControlContentIconRef;
     columnDescription.headerBtnDesc.btnContentInfo.u.iconRef = NULL;
   }
     columnDescription.headerBtnDesc.btnContentInfo.contentType = kControlContentIconRef;
     columnDescription.headerBtnDesc.btnContentInfo.u.iconRef = NULL;
   }

-    
+

  // done:
   return true;
  // done:
   return true;

-} /* InitializeColumnDescription(DataBrowserListViewColumnDesc&, wxDataViewColumn const*, DataBrowserPropertyID, wxMacCFStringHolder const&) */
+}

 
 //-----------------------------------------------------------------------------
 // local function pointers
 
 //-----------------------------------------------------------------------------
 // local function pointers


@@ -204,7 +192,6 @@ DEFINE_ONE_SHOT_HANDLER_GETTER(wxMacDataViewCtrlEventHandler)
 // ---------------------------------------------------------
 // wxMacDataViewModelNotifier
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxMacDataViewModelNotifier
 // ---------------------------------------------------------

-#pragma mark -

 class wxMacDataViewModelNotifier : public wxDataViewModelNotifier
 {
 public:
 class wxMacDataViewModelNotifier : public wxDataViewModelNotifier
 {
 public:


@@ -215,16 +202,16 @@ public:
   virtual bool ItemAdded(const wxDataViewItem &parent, const wxDataViewItem &item)
   {
     DataBrowserItemID itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));
   virtual bool ItemAdded(const wxDataViewItem &parent, const wxDataViewItem &item)
   {
     DataBrowserItemID itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));

-    
+

     wxCHECK_MSG(item.IsOk(),false,_("Added item is invalid."));
     wxCHECK_MSG(item.IsOk(),false,_("Added item is invalid."));

-    bool noFailureFlag = (!(parent.IsOk()) && (this->m_dataViewControlPtr->AddItem(kDataBrowserNoItem,&itemID) == noErr) ||
-                  parent.IsOk()  && (this->m_dataViewControlPtr->AddItem(reinterpret_cast<DataBrowserItemID>(parent.GetID()),&itemID) == noErr));
-    
-    wxDataViewCtrl *dvc = (wxDataViewCtrl*) this->m_dataViewControlPtr->GetPeer();
+    bool noFailureFlag = (!(parent.IsOk()) && (m_dataViewControlPtr->AddItem(kDataBrowserNoItem,&itemID) == noErr) ||
+                  parent.IsOk()  && (m_dataViewControlPtr->AddItem(reinterpret_cast<DataBrowserItemID>(parent.GetID()),&itemID) == noErr));
+
+    wxDataViewCtrl *dvc = (wxDataViewCtrl*) m_dataViewControlPtr->GetWXPeer();

     if (dvc->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {
         wxDataViewModel *model = GetOwner();
     if (dvc->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {
         wxDataViewModel *model = GetOwner();

-    
+

         int height = 20; // TODO find out standard height
         unsigned int num = dvc->GetColumnCount();
         unsigned int col;
         int height = 20; // TODO find out standard height
         unsigned int num = dvc->GetColumnCount();
         unsigned int col;


@@ -233,7 +220,7 @@ public:
             wxDataViewColumn *column = dvc->GetColumn( col );
             if (column->IsHidden())
                 continue;
             wxDataViewColumn *column = dvc->GetColumn( col );
             if (column->IsHidden())
                 continue;

-                
+

             wxDataViewCustomRenderer *renderer = wxDynamicCast( column->GetRenderer(), wxDataViewCustomRenderer );
             if (renderer)
             {
             wxDataViewCustomRenderer *renderer = wxDynamicCast( column->GetRenderer(), wxDataViewCustomRenderer );
             if (renderer)
             {


@@ -242,47 +229,47 @@ public:
                 renderer->SetValue( value );
                 height = wxMax( height, renderer->GetSize().y );
             }
                 renderer->SetValue( value );
                 height = wxMax( height, renderer->GetSize().y );
             }

-            
+

         }
         }

-        
+

         if (height > 20)
         if (height > 20)

-            this->m_dataViewControlPtr->SetRowHeight( itemID, height );
+            m_dataViewControlPtr->SetRowHeight( itemID, height );

     }
     }

-            
+

     return noFailureFlag;
     return noFailureFlag;

-  } /* ItemAdded(wxDataViewItem const&, wxDataViewItem const&) */
+  }

 
   virtual bool ItemsAdded(wxDataViewItem const& parent, wxDataViewItemArray const& items)
   {
     bool noFailureFlag;
 
     DataBrowserItemID* itemIDs;
 
   virtual bool ItemsAdded(wxDataViewItem const& parent, wxDataViewItemArray const& items)
   {
     bool noFailureFlag;
 
     DataBrowserItemID* itemIDs;

-    
+

     size_t noOfEntries;
     size_t noOfEntries;

-    
+

 
    // convert all valid data view items to data browser items:
     itemIDs = ::CreateDataBrowserItemIDArray(noOfEntries,items);
    // insert all valid items into control:
     noFailureFlag = ((noOfEntries == 0) ||
 
    // convert all valid data view items to data browser items:
     itemIDs = ::CreateDataBrowserItemIDArray(noOfEntries,items);
    // insert all valid items into control:
     noFailureFlag = ((noOfEntries == 0) ||

-                     !(parent.IsOk()) && (this->m_dataViewControlPtr->AddItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr) ||
-                     parent.IsOk() && (this->m_dataViewControlPtr->AddItems(reinterpret_cast<DataBrowserItemID>(parent.GetID()),noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr));
+                     !(parent.IsOk()) && (m_dataViewControlPtr->AddItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr) ||
+                     parent.IsOk() && (m_dataViewControlPtr->AddItems(reinterpret_cast<DataBrowserItemID>(parent.GetID()),noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr));

    // give allocated array space free again:
     delete[] itemIDs;
 
    // give allocated array space free again:
     delete[] itemIDs;
 

-    wxDataViewCtrl *dvc = (wxDataViewCtrl*) this->m_dataViewControlPtr->GetPeer();
+    wxDataViewCtrl *dvc = (wxDataViewCtrl*) m_dataViewControlPtr->GetWXPeer();

     if (dvc->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {
         wxDataViewModel *model = GetOwner();
         unsigned int colnum = dvc->GetColumnCount();
     if (dvc->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT)
     {
         wxDataViewModel *model = GetOwner();
         unsigned int colnum = dvc->GetColumnCount();

-        
+

         size_t i;
         size_t count = items.GetCount();
         for (i = 0; i < count; i++)
         size_t i;
         size_t count = items.GetCount();
         for (i = 0; i < count; i++)

-        { 
+        {

             wxDataViewItem item = items[i];
             DataBrowserItemID itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));
             wxDataViewItem item = items[i];
             DataBrowserItemID itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));

-    
+

             int height = 20; // TODO find out standard height
             unsigned int col;
             for (col = 0; col < colnum; col++)
             int height = 20; // TODO find out standard height
             unsigned int col;
             for (col = 0; col < colnum; col++)


@@ -290,10 +277,10 @@ public:
                 wxDataViewColumn *column = dvc->GetColumn( col );
                 if (column->IsHidden())
                     continue;      // skip it!
                 wxDataViewColumn *column = dvc->GetColumn( col );
                 if (column->IsHidden())
                     continue;      // skip it!

-                
+

                 if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
                     continue;      // skip it!
                 if ((col != 0) && model->IsContainer(item) && !model->HasContainerColumns(item))
                     continue;      // skip it!

-            
+

                 wxDataViewCustomRenderer *renderer = wxDynamicCast( column->GetRenderer(), wxDataViewCustomRenderer );
                 if (renderer)
                 {
                 wxDataViewCustomRenderer *renderer = wxDynamicCast( column->GetRenderer(), wxDataViewCustomRenderer );
                 if (renderer)
                 {


@@ -303,114 +290,105 @@ public:
                     height = wxMax( height, renderer->GetSize().y );
                 }
             }
                     height = wxMax( height, renderer->GetSize().y );
                 }
             }

-        
+

             if (height > 20)
             if (height > 20)

-                this->m_dataViewControlPtr->SetRowHeight( itemID, height );
+                m_dataViewControlPtr->SetRowHeight( itemID, height );

         }
         }

-   }    
-    
+   }
+

    // done:
     return noFailureFlag;
    // done:
     return noFailureFlag;

-  } /* ItemsAdded(wxDataViewItem const&, wxDataViewItemArray const&) */
+  }

 
   virtual bool ItemChanged(wxDataViewItem const& item)
   {
     DataBrowserItemID itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));
 
   virtual bool ItemChanged(wxDataViewItem const& item)
   {
     DataBrowserItemID itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));

-    
-    
+
+

     wxCHECK_MSG(item.IsOk(),false,_("Changed item is invalid."));
     wxCHECK_MSG(item.IsOk(),false,_("Changed item is invalid."));

-    if (this->m_dataViewControlPtr->UpdateItems(&itemID) == noErr)
+    if (m_dataViewControlPtr->UpdateItems(&itemID) == noErr)

     {
     {

-      wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->m_dataViewControlPtr->GetPeer()));
-      
+      wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(m_dataViewControlPtr->GetWXPeer()));
+

      // sent the equivalent wxWidget event:
      // sent the equivalent wxWidget event:

-      wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,dataViewCtrlPtr->GetId()); // variable defintion
+      wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,dataViewCtrlPtr->GetId());

 
       dataViewEvent.SetEventObject(dataViewCtrlPtr);
       dataViewEvent.SetItem(item);
      // sent the equivalent wxWidget event:
 
       dataViewEvent.SetEventObject(dataViewCtrlPtr);
       dataViewEvent.SetItem(item);
      // sent the equivalent wxWidget event:

-#if wxCHECK_VERSION(2,9,0)

       dataViewCtrlPtr->HandleWindowEvent(dataViewEvent);
       dataViewCtrlPtr->HandleWindowEvent(dataViewEvent);

-#else
-      dataViewCtrlPtr->GetEventHandler()->ProcessEvent(dataViewEvent);
-#endif

      // done
       return true;
      // done
       return true;

-    } /* if */
+    }

     else
       return false;
     else
       return false;

-  } /* ItemChanged(wxDataViewItem const&) */
+  }

 
   virtual bool ItemsChanged(wxDataViewItemArray const& items)
   {
     bool noFailureFlag;
 
     DataBrowserItemID* itemIDs;
 
   virtual bool ItemsChanged(wxDataViewItemArray const& items)
   {
     bool noFailureFlag;
 
     DataBrowserItemID* itemIDs;

-    
+

     size_t noOfEntries;
     size_t noOfEntries;

-    
+

 
    // convert all valid data view items to data browser items:
     itemIDs = ::CreateDataBrowserItemIDArray(noOfEntries,items);
    // change items (ATTENTION: ONLY ITEMS OF THE ROOT ARE CHANGED BECAUSE THE PARENT PARAMETER IS MISSING):
 
    // convert all valid data view items to data browser items:
     itemIDs = ::CreateDataBrowserItemIDArray(noOfEntries,items);
    // change items (ATTENTION: ONLY ITEMS OF THE ROOT ARE CHANGED BECAUSE THE PARENT PARAMETER IS MISSING):

-    noFailureFlag = (this->m_dataViewControlPtr->UpdateItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty) == noErr);
+    noFailureFlag = (m_dataViewControlPtr->UpdateItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty) == noErr);

     if (noFailureFlag)
     {
     if (noFailureFlag)
     {

-      wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->m_dataViewControlPtr->GetPeer()));
-      
+      wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(m_dataViewControlPtr->GetWXPeer()));
+

      // send for all changed items a wxWidget event:
      // send for all changed items a wxWidget event:

-      wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,dataViewCtrlPtr->GetId()); // variable defintion
+      wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,dataViewCtrlPtr->GetId());

 
       dataViewEvent.SetEventObject(dataViewCtrlPtr);
       for (size_t i=0; i<noOfEntries; ++i)
       {
         dataViewEvent.SetItem(reinterpret_cast<void*>(itemIDs[i]));
 
       dataViewEvent.SetEventObject(dataViewCtrlPtr);
       for (size_t i=0; i<noOfEntries; ++i)
       {
         dataViewEvent.SetItem(reinterpret_cast<void*>(itemIDs[i]));

-#if wxCHECK_VERSION(2,9,0)

         dataViewCtrlPtr->HandleWindowEvent(dataViewEvent);
         dataViewCtrlPtr->HandleWindowEvent(dataViewEvent);

-#else
-        dataViewCtrlPtr->GetEventHandler()->ProcessEvent(dataViewEvent);
-#endif
-      } /* for */
-    } /* if */
+      }
+    }

    // release allocated array space:
     delete[] itemIDs;
    // done:
     return noFailureFlag;
    // release allocated array space:
     delete[] itemIDs;
    // done:
     return noFailureFlag;

-  } /* ItemsChanged(wxDataViewItem const&) */
+  }

 
   virtual bool ItemDeleted(wxDataViewItem const& parent, wxDataViewItem const& item)
   {
     if (item.IsOk())
     {
 
   virtual bool ItemDeleted(wxDataViewItem const& parent, wxDataViewItem const& item)
   {
     if (item.IsOk())
     {

-     // variable definition and initialization:

       DataBrowserItemID itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));
       OSStatus          errorStatus;
       DataBrowserItemID itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));
       OSStatus          errorStatus;

-      wxDataViewCtrl*   dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->m_dataViewControlPtr->GetPeer()));
-      
+      wxDataViewCtrl*   dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(m_dataViewControlPtr->GetWXPeer()));
+

      // when this method is called and currently an item is being edited this item may have already been deleted in the model (the passed item and the being edited item have
      // not to be identical because the being edited item might be below the passed item in the hierarchy);
      // to prevent the control trying to ask the model to update an already deleted item the control is informed that currently a deleting process
      // has been started and that variables can currently not be updated even when requested by the system:
       dataViewCtrlPtr->SetDeleting(true);
      // when this method is called and currently an item is being edited this item may have already been deleted in the model (the passed item and the being edited item have
      // not to be identical because the being edited item might be below the passed item in the hierarchy);
      // to prevent the control trying to ask the model to update an already deleted item the control is informed that currently a deleting process
      // has been started and that variables can currently not be updated even when requested by the system:
       dataViewCtrlPtr->SetDeleting(true);

-      errorStatus = this->m_dataViewControlPtr->RemoveItem(reinterpret_cast<DataBrowserItemID>(parent.GetID()),&itemID);
+      errorStatus = m_dataViewControlPtr->RemoveItem(reinterpret_cast<DataBrowserItemID>(parent.GetID()),&itemID);

      // enable automatic updating again:
       dataViewCtrlPtr->SetDeleting(false);
       return (errorStatus == noErr);
      // enable automatic updating again:
       dataViewCtrlPtr->SetDeleting(false);
       return (errorStatus == noErr);

-    } /* if */
+    }

     else
       return false;
     else
       return false;

-  } /* ItemDeleted(wxDataViewItem const&, wxDataViewItem const&) */
+  }

 
   virtual bool ItemsDeleted(wxDataViewItem const& parent, wxDataViewItemArray const& items)
   {
     bool noFailureFlag;
 
     DataBrowserItemID* itemIDs;
 
   virtual bool ItemsDeleted(wxDataViewItem const& parent, wxDataViewItemArray const& items)
   {
     bool noFailureFlag;
 
     DataBrowserItemID* itemIDs;

-    
-    wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->m_dataViewControlPtr->GetPeer()));
+
+    wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(m_dataViewControlPtr->GetWXPeer()));

 
     size_t noOfEntries;
 
     size_t noOfEntries;

-    
+

 
     wxCHECK_MSG(dataViewCtrlPtr != NULL,false,_("Data view control is not correctly initialized"));
    // convert all valid data view items to data browser items:
 
     wxCHECK_MSG(dataViewCtrlPtr != NULL,false,_("Data view control is not correctly initialized"));
    // convert all valid data view items to data browser items:


@@ -422,134 +400,119 @@ public:
     dataViewCtrlPtr->SetDeleting(true);
    // insert all valid items into control:
     noFailureFlag = ((noOfEntries == 0) ||
     dataViewCtrlPtr->SetDeleting(true);
    // insert all valid items into control:
     noFailureFlag = ((noOfEntries == 0) ||

-                     !(parent.IsOk()) && (this->m_dataViewControlPtr->RemoveItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr) ||
-                     parent.IsOk() && (this->m_dataViewControlPtr->RemoveItems(reinterpret_cast<DataBrowserItemID>(parent.GetID()),noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr));
+                     !(parent.IsOk()) && (m_dataViewControlPtr->RemoveItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr) ||
+                     parent.IsOk() && (m_dataViewControlPtr->RemoveItems(reinterpret_cast<DataBrowserItemID>(parent.GetID()),noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr));

    // enable automatic updating again:
     dataViewCtrlPtr->SetDeleting(false);
    // give allocated array space free again:
     delete[] itemIDs;
    // done:
     return noFailureFlag;
    // enable automatic updating again:
     dataViewCtrlPtr->SetDeleting(false);
    // give allocated array space free again:
     delete[] itemIDs;
    // done:
     return noFailureFlag;

-  } /* ItemsDeleted(wxDataViewItem const&, wxDataViewItemArray const&) */
+  }

 
   virtual bool ValueChanged(wxDataViewItem const& item, unsigned int col)
   {
     DataBrowserItemID itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));
     DataBrowserItemID parentID;
 
   virtual bool ValueChanged(wxDataViewItem const& item, unsigned int col)
   {
     DataBrowserItemID itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));
     DataBrowserItemID parentID;

-    
+

     DataBrowserPropertyID propertyID;
 
     DataBrowserPropertyID propertyID;
 

-    wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->m_dataViewControlPtr->GetPeer()));
+    wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(m_dataViewControlPtr->GetWXPeer()));

 
 
     wxCHECK_MSG(item.IsOk(),             false,_("Passed item is invalid."));
     wxCHECK_MSG(this->GetOwner() != NULL,false,_("Owner not initialized."));
     wxCHECK_MSG(dataViewCtrlPtr != NULL, false,_("Control is wrongly initialized."));
     parentID = reinterpret_cast<DataBrowserItemID>(this->GetOwner()->GetParent(item).GetID());
 
 
     wxCHECK_MSG(item.IsOk(),             false,_("Passed item is invalid."));
     wxCHECK_MSG(this->GetOwner() != NULL,false,_("Owner not initialized."));
     wxCHECK_MSG(dataViewCtrlPtr != NULL, false,_("Control is wrongly initialized."));
     parentID = reinterpret_cast<DataBrowserItemID>(this->GetOwner()->GetParent(item).GetID());

-    if ((this->m_dataViewControlPtr->GetPropertyID(col,&propertyID) == noErr) &&
-        (this->m_dataViewControlPtr->UpdateItems(parentID,1,&itemID,dataViewCtrlPtr->GetColumn(col)->GetPropertyID(),propertyID) == noErr))
+    if ((m_dataViewControlPtr->GetPropertyID(col,&propertyID) == noErr) &&
+        (m_dataViewControlPtr->UpdateItems(parentID,1,&itemID,dataViewCtrlPtr->GetColumn(col)->GetPropertyID(),propertyID) == noErr))

     {
     {

-     // variable definition and initialization:

       wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,dataViewCtrlPtr->GetId());
 
       dataViewEvent.SetEventObject(dataViewCtrlPtr);
       dataViewEvent.SetColumn(col);
       dataViewEvent.SetItem(item);
      // send the equivalent wxWidget event:
       wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,dataViewCtrlPtr->GetId());
 
       dataViewEvent.SetEventObject(dataViewCtrlPtr);
       dataViewEvent.SetColumn(col);
       dataViewEvent.SetItem(item);
      // send the equivalent wxWidget event:

-#if wxCHECK_VERSION(2,9,0)

       dataViewCtrlPtr->HandleWindowEvent(dataViewEvent);
       dataViewCtrlPtr->HandleWindowEvent(dataViewEvent);

-#else
-      dataViewCtrlPtr->GetEventHandler()->ProcessEvent(dataViewEvent);
-#endif

      // done
       return true;
      // done
       return true;

-    } /* if */
+    }

     else
       return false;
     else
       return false;

-  } /* ValueChanged(wxDataViewItem const&, unsigned int) */
+  }

 
   virtual bool Cleared()
   {
 
   virtual bool Cleared()
   {

-    bool noFailureFlag = (this->m_dataViewControlPtr->RemoveItems() == noErr);
+    bool noFailureFlag = (m_dataViewControlPtr->RemoveItems() == noErr);

     wxDataViewItem item;
     wxDataViewItemArray array;
     GetOwner()->GetChildren( item, array );
     ItemsAdded( item, array );
     wxDataViewItem item;
     wxDataViewItemArray array;
     GetOwner()->GetChildren( item, array );
     ItemsAdded( item, array );

-    this->m_dataViewControlPtr->SetScrollPosition(0, 0);
+    m_dataViewControlPtr->SetScrollPosition(0, 0);

     return noFailureFlag;
     return noFailureFlag;

-  } /* Cleared() */
+  }

 
   virtual void Resort()
   {
 
   virtual void Resort()
   {

-    this->m_dataViewControlPtr->Resort();
+    m_dataViewControlPtr->Resort();

   }
 
   }
 

-protected:

 private:
 private:

-//
-// variables
-//

   wxMacDataViewDataBrowserListViewControl* m_dataViewControlPtr;
 };
 
 // ---------------------------------------------------------
 // wxDataViewRenderer
 // ---------------------------------------------------------
   wxMacDataViewDataBrowserListViewControl* m_dataViewControlPtr;
 };
 
 // ---------------------------------------------------------
 // wxDataViewRenderer
 // ---------------------------------------------------------

-#pragma mark -

 wxDataViewRenderer::wxDataViewRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                    :wxDataViewRendererBase(varianttype,mode,align), m_alignment(align), m_mode(mode)
 {
 wxDataViewRenderer::wxDataViewRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                    :wxDataViewRendererBase(varianttype,mode,align), m_alignment(align), m_mode(mode)
 {

-} /* wxDataViewRenderer::wxDataViewRenderer(wxString const&, wxDataViewCellMode) */
+}

 
 void wxDataViewRenderer::SetMode(wxDataViewCellMode mode)
 {
   wxDataViewColumn* dataViewColumnPtr;
 
 
 
 void wxDataViewRenderer::SetMode(wxDataViewCellMode mode)
 {
   wxDataViewColumn* dataViewColumnPtr;
 
 

-  this->m_mode = mode;
+  m_mode = mode;

   dataViewColumnPtr = this->GetOwner();
   if (dataViewColumnPtr != NULL)
   {
   dataViewColumnPtr = this->GetOwner();
   if (dataViewColumnPtr != NULL)
   {

-   // variable definition and initialization:

     wxDataViewCtrl* dataViewCtrlPtr(dataViewColumnPtr->GetOwner());
     wxDataViewCtrl* dataViewCtrlPtr(dataViewColumnPtr->GetOwner());

-    
+

     if (dataViewCtrlPtr != NULL)
     {
     if (dataViewCtrlPtr != NULL)
     {

-     // variable definition and initialization:

       wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
       wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-      
+

       if (macDataViewListCtrlPtr != NULL)
       {
       if (macDataViewListCtrlPtr != NULL)
       {

-       // variable definition and initialization:

         DataBrowserPropertyFlags flags;
         DataBrowserPropertyFlags flags;

-        
+

         verify_noerr(macDataViewListCtrlPtr->GetPropertyFlags(dataViewColumnPtr->GetPropertyID(),&flags));
         if (mode == wxDATAVIEW_CELL_EDITABLE)
           flags |= kDataBrowserPropertyIsEditable;
         else
           flags &= ~kDataBrowserPropertyIsEditable;
         verify_noerr(macDataViewListCtrlPtr->SetPropertyFlags(dataViewColumnPtr->GetPropertyID(),flags));
         verify_noerr(macDataViewListCtrlPtr->GetPropertyFlags(dataViewColumnPtr->GetPropertyID(),&flags));
         if (mode == wxDATAVIEW_CELL_EDITABLE)
           flags |= kDataBrowserPropertyIsEditable;
         else
           flags &= ~kDataBrowserPropertyIsEditable;
         verify_noerr(macDataViewListCtrlPtr->SetPropertyFlags(dataViewColumnPtr->GetPropertyID(),flags));

-      } /* if */
-    } /* if */
-  } /* if */
-} /* wxDataViewRenderer::SetMode(wxDataViewCellMode) */
+      }
+    }
+  }
+}

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer,wxDataViewRendererBase)
 
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer,wxDataViewRendererBase)
 
 // ---------------------------------------------------------
 // wxDataViewCustomRenderer
 // ---------------------------------------------------------

-#pragma mark -

 wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                          :wxDataViewRenderer(varianttype,mode,align), m_editorCtrlPtr(NULL), m_DCPtr(NULL)
 {
 wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                          :wxDataViewRenderer(varianttype,mode,align), m_editorCtrlPtr(NULL), m_DCPtr(NULL)
 {

-} /* wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const&, wxDataViewCellMode) */
+}

 
 wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
 {
 
 wxDataViewCustomRenderer::~wxDataViewCustomRenderer()
 {

-  if (this->m_DCPtr != NULL)
-    delete this->m_DCPtr;
-} /* wxDataViewCustomRenderer::~wxDataViewCustomRenderer() */
+    delete m_DCPtr;
+}

 
 void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state )
 {
 
 void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state )
 {


@@ -562,77 +525,69 @@ void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wx
 
 wxDC* wxDataViewCustomRenderer::GetDC()
 {
 
 wxDC* wxDataViewCustomRenderer::GetDC()
 {

-  if (this->m_DCPtr == NULL)
+  if (m_DCPtr == NULL)

   {
     if ((GetOwner() == NULL) || (GetOwner()->GetOwner() == NULL))
       return NULL;
   {
     if ((GetOwner() == NULL) || (GetOwner()->GetOwner() == NULL))
       return NULL;

-    this->m_DCPtr = new wxWindowDC(this->GetOwner()->GetOwner());
-  } /* if */
-  return this->m_DCPtr;
-} /* wxDataViewCustomRenderer::GetDC() */
+    m_DCPtr = new wxWindowDC(this->GetOwner()->GetOwner());
+  }
+  return m_DCPtr;
+}

 
 bool wxDataViewCustomRenderer::Render()
 {
   return true;
 
 bool wxDataViewCustomRenderer::Render()
 {
   return true;

-} /* wxDataViewCustomRenderer::Render() */
+}

 
 void wxDataViewCustomRenderer::SetDC(wxDC* newDCPtr)
 {
 
 void wxDataViewCustomRenderer::SetDC(wxDC* newDCPtr)
 {

-  delete this->m_DCPtr;
-  this->m_DCPtr = newDCPtr;
-} /* wxDataViewCustomRenderer::SetDC(wxDC*) */
+  delete m_DCPtr;
+  m_DCPtr = newDCPtr;
+}

 
 WXDataBrowserPropertyType wxDataViewCustomRenderer::GetPropertyType() const
 {
   return kDataBrowserCustomType;
 
 WXDataBrowserPropertyType wxDataViewCustomRenderer::GetPropertyType() const
 {
   return kDataBrowserCustomType;

-} /* wxDataViewCustomRenderer::GetPropertyType() const */
+}

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewTextRenderer
 // ---------------------------------------------------------

-#pragma mark -

 wxDataViewTextRenderer::wxDataViewTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                        :wxDataViewRenderer(varianttype,mode,align)
 {
 wxDataViewTextRenderer::wxDataViewTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                        :wxDataViewRenderer(varianttype,mode,align)
 {

-} /* wxDataViewTextRenderer::wxDataViewTextRenderer(wxString const&, wxDataViewCellMode, int) */
+}

 
 bool wxDataViewTextRenderer::Render()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Text renderer cannot render value; value type: ")) << this->GetValue().GetType());
 
 
 bool wxDataViewTextRenderer::Render()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Text renderer cannot render value; value type: ")) << this->GetValue().GetType());
 

- // variable definition:
-#if wxCHECK_VERSION(2,9,0)

   wxCFStringRef cfString(this->GetValue().GetString(),(this->GetView()->GetFont().Ok() ? this->GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
   wxCFStringRef cfString(this->GetValue().GetString(),(this->GetView()->GetFont().Ok() ? this->GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));

-#else
-  wxMacCFStringHolder cfString(this->GetValue().GetString(),(this->GetView()->GetFont().Ok() ? this->GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
-#endif

   return (::SetDataBrowserItemDataText(this->GetDataReference(),cfString) == noErr);
   return (::SetDataBrowserItemDataText(this->GetDataReference(),cfString) == noErr);

-} /* wxDataViewTextRenderer::Render() */
+}

 
 WXDataBrowserPropertyType wxDataViewTextRenderer::GetPropertyType() const
 {
   return kDataBrowserTextType;
 
 WXDataBrowserPropertyType wxDataViewTextRenderer::GetPropertyType() const
 {
   return kDataBrowserTextType;

-} /* wxDataViewTextRenderer::GetPropertyType() const */
+}

 
 IMPLEMENT_CLASS(wxDataViewTextRenderer,wxDataViewRenderer)
 
 
 IMPLEMENT_CLASS(wxDataViewTextRenderer,wxDataViewRenderer)
 

-// --------------------------------------------------------- 
+// ---------------------------------------------------------

 // wxDataViewTextRendererAttr
 // wxDataViewTextRendererAttr

-// --------------------------------------------------------- 
-#pragma mark -
+// ---------------------------------------------------------

 wxDataViewTextRendererAttr::wxDataViewTextRendererAttr(wxString const& varianttype, wxDataViewCellMode mode, int align)
                            :wxDataViewTextRenderer(varianttype,mode,align)
 {
 wxDataViewTextRendererAttr::wxDataViewTextRendererAttr(wxString const& varianttype, wxDataViewCellMode mode, int align)
                            :wxDataViewTextRenderer(varianttype,mode,align)
 {

-} /* wxDataViewTextRendererAttr::wxDataViewTextRendererAttr(wxString const&, wxDataViewCellMode, int) */
-    
+}
+

 IMPLEMENT_CLASS(wxDataViewTextRendererAttr,wxDataViewTextRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------
 IMPLEMENT_CLASS(wxDataViewTextRendererAttr,wxDataViewTextRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------

-#pragma mark -

 wxDataViewBitmapRenderer::wxDataViewBitmapRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                          :wxDataViewRenderer(varianttype,mode,align)
 {
 wxDataViewBitmapRenderer::wxDataViewBitmapRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                          :wxDataViewRenderer(varianttype,mode,align)
 {


@@ -646,31 +601,25 @@ bool wxDataViewBitmapRenderer::Render()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Bitmap renderer cannot render value; value type: ")) << this->GetValue().GetType());
 
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Bitmap renderer cannot render value; value type: ")) << this->GetValue().GetType());
 

- // variable definition:

   wxBitmap bitmap;
   wxBitmap bitmap;

-  
+

   bitmap << this->GetValue();
   if (bitmap.Ok())
   bitmap << this->GetValue();
   if (bitmap.Ok())

-#if wxCHECK_VERSION(2,9,0)

     return (::SetDataBrowserItemDataIcon(this->GetDataReference(),bitmap.GetIconRef()) == noErr);
     return (::SetDataBrowserItemDataIcon(this->GetDataReference(),bitmap.GetIconRef()) == noErr);

-#else
-    return (::SetDataBrowserItemDataIcon(this->GetDataReference(),bitmap.GetBitmapData()->GetIconRef()) == noErr);
-#endif

   else
     return true;
   else
     return true;

-} /* wxDataViewBitmapRenderer::Render() */
+}

 
 WXDataBrowserPropertyType wxDataViewBitmapRenderer::GetPropertyType() const
 {
   return kDataBrowserIconType;
 
 WXDataBrowserPropertyType wxDataViewBitmapRenderer::GetPropertyType() const
 {
   return kDataBrowserIconType;

-} /* wxDataViewBitmapRenderer::GetPropertyType() const */
+}

 
 IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------
 
 IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------

-#pragma mark -

 wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                            :wxDataViewRenderer(varianttype,mode)
 {
 wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                            :wxDataViewRenderer(varianttype,mode)
 {


@@ -680,28 +629,22 @@ bool wxDataViewIconTextRenderer::Render()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Icon & text renderer cannot render value; value type: ")) << this->GetValue().GetType());
 
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Icon & text renderer cannot render value; value type: ")) << this->GetValue().GetType());
 

- // variable definition:

   wxDataViewIconText iconText;
   wxDataViewIconText iconText;

-  
+

   iconText << this->GetValue();
 
   iconText << this->GetValue();
 

- // variable definition:
-#if wxCHECK_VERSION(2,9,0)

   wxCFStringRef cfString(iconText.GetText(),(this->GetView()->GetFont().Ok() ? this->GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
   wxCFStringRef cfString(iconText.GetText(),(this->GetView()->GetFont().Ok() ? this->GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));

-#else
-  wxMacCFStringHolder cfString(iconText.GetText(),(this->GetView()->GetFont().Ok() ? this->GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
-#endif

 
   if (iconText.GetIcon().IsOk())
     if (::SetDataBrowserItemDataIcon(this->GetDataReference(),MAC_WXHICON(iconText.GetIcon().GetHICON())) != noErr)
       return false;
   return (::SetDataBrowserItemDataText(this->GetDataReference(),cfString) == noErr);
 
   if (iconText.GetIcon().IsOk())
     if (::SetDataBrowserItemDataIcon(this->GetDataReference(),MAC_WXHICON(iconText.GetIcon().GetHICON())) != noErr)
       return false;
   return (::SetDataBrowserItemDataText(this->GetDataReference(),cfString) == noErr);

-} /* wxDataViewIconTextRenderer::Render() */
+}

 
 WXDataBrowserPropertyType wxDataViewIconTextRenderer::GetPropertyType() const
 {
   return kDataBrowserIconAndTextType;
 
 WXDataBrowserPropertyType wxDataViewIconTextRenderer::GetPropertyType() const
 {
   return kDataBrowserIconAndTextType;

-} /* wxDataViewIconTextRenderer::GetPropertyType() const */
+}

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
 


@@ -709,7 +652,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
 // ---------------------------------------------------------
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------

-#pragma mark -

 wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                          :wxDataViewRenderer(varianttype,mode)
 {
 wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                          :wxDataViewRenderer(varianttype,mode)
 {


@@ -719,19 +661,18 @@ bool wxDataViewToggleRenderer::Render()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Toggle renderer cannot render value; value type: ")) << this->GetValue().GetType());
   return (::SetDataBrowserItemDataButtonValue(this->GetDataReference(),this->GetValue().GetBool()) == noErr);
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Toggle renderer cannot render value; value type: ")) << this->GetValue().GetType());
   return (::SetDataBrowserItemDataButtonValue(this->GetDataReference(),this->GetValue().GetBool()) == noErr);

-} /* wxDataViewToggleRenderer::Render() */
+}

 
 WXDataBrowserPropertyType wxDataViewToggleRenderer::GetPropertyType() const
 {
   return kDataBrowserCheckboxType;
 
 WXDataBrowserPropertyType wxDataViewToggleRenderer::GetPropertyType() const
 {
   return kDataBrowserCheckboxType;

-} /* wxDataViewToggleRenderer::GetPropertyType() const */
+}

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewProgressRenderer
 // ---------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewProgressRenderer
 // ---------------------------------------------------------

-#pragma mark -

 wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& label, wxString const& varianttype, wxDataViewCellMode mode, int align)
                            :wxDataViewRenderer(varianttype,mode,align)
 {
 wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& label, wxString const& varianttype, wxDataViewCellMode mode, int align)
                            :wxDataViewRenderer(varianttype,mode,align)
 {


@@ -743,19 +684,18 @@ bool wxDataViewProgressRenderer::Render()
   return ((::SetDataBrowserItemDataMinimum(this->GetDataReference(),  0)                        == noErr) &&
           (::SetDataBrowserItemDataMaximum(this->GetDataReference(),100)                        == noErr) &&
           (::SetDataBrowserItemDataValue  (this->GetDataReference(),this->GetValue().GetLong()) == noErr));
   return ((::SetDataBrowserItemDataMinimum(this->GetDataReference(),  0)                        == noErr) &&
           (::SetDataBrowserItemDataMaximum(this->GetDataReference(),100)                        == noErr) &&
           (::SetDataBrowserItemDataValue  (this->GetDataReference(),this->GetValue().GetLong()) == noErr));

-} /* wxDataViewProgressRenderer::Render() */
+}

 
 WXDataBrowserPropertyType wxDataViewProgressRenderer::GetPropertyType() const
 {
   return kDataBrowserProgressBarType;
 
 WXDataBrowserPropertyType wxDataViewProgressRenderer::GetPropertyType() const
 {
   return kDataBrowserProgressBarType;

-} /* wxDataViewProgressRenderer::GetPropertyType() const */
+}

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer,wxDataViewRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewDateRenderer
 // ---------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer,wxDataViewRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewDateRenderer
 // ---------------------------------------------------------

-#pragma mark -

 wxDataViewDateRenderer::wxDataViewDateRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                        :wxDataViewRenderer(varianttype,mode,align)
 {
 wxDataViewDateRenderer::wxDataViewDateRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align)
                        :wxDataViewRenderer(varianttype,mode,align)
 {


@@ -765,47 +705,31 @@ bool wxDataViewDateRenderer::Render()
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Date renderer cannot render value; value type: ")) << this->GetValue().GetType());
   return (::SetDataBrowserItemDataDateTime(this->GetDataReference(),this->GetValue().GetDateTime().Subtract(wxDateTime(1,wxDateTime::Jan,1904)).GetSeconds().GetLo()) == noErr);
 {
   wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Date renderer cannot render value; value type: ")) << this->GetValue().GetType());
   return (::SetDataBrowserItemDataDateTime(this->GetDataReference(),this->GetValue().GetDateTime().Subtract(wxDateTime(1,wxDateTime::Jan,1904)).GetSeconds().GetLo()) == noErr);

-} /* wxDataViewDateRenderer::Render() */
+}

 
 WXDataBrowserPropertyType wxDataViewDateRenderer::GetPropertyType() const
 {
   return kDataBrowserDateTimeType;
 
 WXDataBrowserPropertyType wxDataViewDateRenderer::GetPropertyType() const
 {
   return kDataBrowserDateTimeType;

-} /* wxDataViewDateRenderer::GetPropertyType() const */
+}

 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer,wxDataViewRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewColumn
 // ---------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer,wxDataViewRenderer)
 
 // ---------------------------------------------------------
 // wxDataViewColumn
 // ---------------------------------------------------------

-#pragma mark -
-wxDataViewColumn::wxDataViewColumn(wxString const &title, wxDataViewRenderer *cell, unsigned int model_column, int width, wxAlignment align, int flags)
-                 :wxDataViewColumnBase(title,cell,model_column,width,align,flags), m_ascending(true),
-                  m_flags(flags & ~(wxDATAVIEW_COL_HIDDEN)), m_maxWidth(30000), m_minWidth(0), m_width(width >= 0 ? width : wxDVC_DEFAULT_WIDTH),
-                  m_alignment(align), m_title(title)
-{
-} /* wxDataViewColumn::wxDataViewColumn(wxString const &title, wxDataViewRenderer*, unsigned int, int, wxAlignment, int) */
-
-wxDataViewColumn::wxDataViewColumn(wxBitmap const& bitmap, wxDataViewRenderer *cell, unsigned int model_column, int width, wxAlignment align, int flags)
-                 :wxDataViewColumnBase(bitmap,cell,model_column,width,align,flags), m_ascending(true),
-                  m_flags(flags & ~(wxDATAVIEW_COL_HIDDEN)), m_maxWidth(30000), m_minWidth(0), m_width(width >= 0 ? width : wxDVC_DEFAULT_WIDTH),
-                  m_alignment(align)
-{
-} /* wxDataViewColumn::wxDataViewColumn(wxBitmap const&, wxDataViewRenderer*, unsigned int, int, wxAlignment, int) */

 
 void wxDataViewColumn::SetAlignment(wxAlignment align)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 
 
 void wxDataViewColumn::SetAlignment(wxAlignment align)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 

-  
-  this->m_alignment = align;
+
+  m_alignment = align;

   if (dataViewCtrlPtr != NULL)
   {
   if (dataViewCtrlPtr != NULL)
   {

-   // variable definition and initialization:

     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-    
+

     if (macDataViewListCtrlPtr != NULL)
     {
     if (macDataViewListCtrlPtr != NULL)
     {

-     // variable definition and initialization:

       DataBrowserListViewHeaderDesc headerDescription;
 
       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
       DataBrowserListViewHeaderDesc headerDescription;
 
       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));


@@ -823,11 +747,11 @@ void wxDataViewColumn::SetAlignment(wxAlignment align)
           break;
         default:
           headerDescription.btnFontStyle.just = teFlushDefault;
           break;
         default:
           headerDescription.btnFontStyle.just = teFlushDefault;

-      } /* switch */
+      }

       wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not set alignment."));
       wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not set alignment."));

-    } /* if */
-  } /* if */
-} /* wxDataViewColumn::SetAlignment(wxAlignment) */
+    }
+  }
+}

 
 void wxDataViewColumn::SetBitmap(wxBitmap const& bitmap)
 {
 
 void wxDataViewColumn::SetBitmap(wxBitmap const& bitmap)
 {


@@ -837,98 +761,79 @@ void wxDataViewColumn::SetBitmap(wxBitmap const& bitmap)
   wxDataViewColumnBase::SetBitmap(bitmap);
   if (dataViewCtrlPtr != NULL)
   {
   wxDataViewColumnBase::SetBitmap(bitmap);
   if (dataViewCtrlPtr != NULL)
   {

-   // variable definition and initialization:

     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-    
+

     if (macDataViewListCtrlPtr != NULL)
     {
     if (macDataViewListCtrlPtr != NULL)
     {

-     // variable definition and initialization:

       DataBrowserListViewHeaderDesc headerDescription;
 
       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
       if (this->GetBitmap().Ok())
       DataBrowserListViewHeaderDesc headerDescription;
 
       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
       if (this->GetBitmap().Ok())

-#if wxCHECK_VERSION(2,9,0)

         headerDescription.btnContentInfo.u.iconRef = this->GetBitmap().GetIconRef();
         headerDescription.btnContentInfo.u.iconRef = this->GetBitmap().GetIconRef();

-#else
-        headerDescription.btnContentInfo.u.iconRef = this->GetBitmap().GetBitmapData()->GetIconRef();
-#endif

       else
         headerDescription.btnContentInfo.u.iconRef = NULL;
       wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not set icon."));
       else
         headerDescription.btnContentInfo.u.iconRef = NULL;
       wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not set icon."));

-    } /* if */
-  } /* if */
-} /* wxDataViewColumn::SetBitmap(wxBitmap const&) */
-
-void wxDataViewColumn::SetFlags(int flags)
-{
-  this->SetHidden     ((flags & wxDATAVIEW_COL_HIDDEN)      != 0);
-  this->SetReorderable((flags & wxDATAVIEW_COL_REORDERABLE) != 0);
-  this->SetResizeable ((flags & wxDATAVIEW_COL_RESIZABLE)   != 0);
-  this->SetSortable   ((flags & wxDATAVIEW_COL_SORTABLE)    != 0);
-} /* wxDataViewColumn::SetFlags(int) */
+    }
+  }
+}

 
 void wxDataViewColumn::SetMaxWidth(int maxWidth)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 
 
 void wxDataViewColumn::SetMaxWidth(int maxWidth)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 

-  
-  this->m_maxWidth = maxWidth;
+
+  m_maxWidth = maxWidth;

   if (dataViewCtrlPtr != NULL)
   {
   if (dataViewCtrlPtr != NULL)
   {

-   // variable definition and initialization:

     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-    
+

     if (macDataViewListCtrlPtr != NULL)
     {
     if (macDataViewListCtrlPtr != NULL)
     {

-     // variable definition and initialization:

       DataBrowserListViewHeaderDesc headerDescription;
       DataBrowserListViewHeaderDesc headerDescription;

-      
+

       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
       headerDescription.maximumWidth = static_cast<UInt16>(maxWidth);
       wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not set maximum width."));
       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
       headerDescription.maximumWidth = static_cast<UInt16>(maxWidth);
       wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not set maximum width."));

-    } /* if */
-  } /* if */
-} /* wxDataViewColumn::SetMaxWidth(int) */
+    }
+  }
+}

 
 void wxDataViewColumn::SetMinWidth(int minWidth)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 
 
 void wxDataViewColumn::SetMinWidth(int minWidth)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 

-  
-  this->m_minWidth = minWidth;
+
+  m_minWidth = minWidth;

   if (dataViewCtrlPtr != NULL)
   {
   if (dataViewCtrlPtr != NULL)
   {

-   // variable definition and initialization:

     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-    
+

     if (macDataViewListCtrlPtr != NULL)
     {
     if (macDataViewListCtrlPtr != NULL)
     {

-     // variable definition and initialization:

       DataBrowserListViewHeaderDesc headerDescription;
       DataBrowserListViewHeaderDesc headerDescription;

-      
+

       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
       headerDescription.minimumWidth = static_cast<UInt16>(minWidth);
       wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not set minimum width."));
       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
       headerDescription.minimumWidth = static_cast<UInt16>(minWidth);
       wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not set minimum width."));

-    } /* if */
-  } /* if */
-} /* wxDataViewColumn::SetMaxWidth(int) */
+    }
+  }
+}

 
 void wxDataViewColumn::SetReorderable(bool reorderable)
 {
  // first set the internal flag of the column:
   if (reorderable)
 
 void wxDataViewColumn::SetReorderable(bool reorderable)
 {
  // first set the internal flag of the column:
   if (reorderable)

-    this->m_flags |= wxDATAVIEW_COL_REORDERABLE;
+    m_flags |= wxDATAVIEW_COL_REORDERABLE;

   else
   else

-    this->m_flags &= ~wxDATAVIEW_COL_REORDERABLE;
+    m_flags &= ~wxDATAVIEW_COL_REORDERABLE;

  // if the column is associated with a control change also immediately the flags of the control:
  // if the column is associated with a control change also immediately the flags of the control:

-  wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); // variable definition and initialization
+  wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());

 
   if (dataViewCtrlPtr != NULL)
   {
 
   if (dataViewCtrlPtr != NULL)
   {

-   // variable definition and initialization:

     DataBrowserPropertyFlags                       flags;
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
     DataBrowserPropertyFlags                       flags;
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-    
+

     wxCHECK_RET(macDataViewListCtrlPtr != NULL,                                                 _("Valid pointer to native data view control does not exist"));
     wxCHECK_RET(macDataViewListCtrlPtr->GetPropertyFlags(this->GetPropertyID(),&flags) == noErr,_("Could not get property flags."));
     if (reorderable)
     wxCHECK_RET(macDataViewListCtrlPtr != NULL,                                                 _("Valid pointer to native data view control does not exist"));
     wxCHECK_RET(macDataViewListCtrlPtr->GetPropertyFlags(this->GetPropertyID(),&flags) == noErr,_("Could not get property flags."));
     if (reorderable)


@@ -936,60 +841,57 @@ void wxDataViewColumn::SetReorderable(bool reorderable)
     else
       flags &= ~kDataBrowserListViewMovableColumn;
     wxCHECK_RET(macDataViewListCtrlPtr->SetPropertyFlags(this->GetPropertyID(),flags) == noErr,_("Could not set property flags."));
     else
       flags &= ~kDataBrowserListViewMovableColumn;
     wxCHECK_RET(macDataViewListCtrlPtr->SetPropertyFlags(this->GetPropertyID(),flags) == noErr,_("Could not set property flags."));

-  } /* if */
-} /* wxDataViewColumn::SetReorderable(bool) */
+  }
+}

 
 void wxDataViewColumn::SetResizeable(bool resizeable)
 {
  // first set the internal flag of the column:
   if (resizeable)
 
 void wxDataViewColumn::SetResizeable(bool resizeable)
 {
  // first set the internal flag of the column:
   if (resizeable)

-    this->m_flags |= wxDATAVIEW_COL_RESIZABLE;
+    m_flags |= wxDATAVIEW_COL_RESIZABLE;

   else
   else

-    this->m_flags &= ~wxDATAVIEW_COL_RESIZABLE;
+    m_flags &= ~wxDATAVIEW_COL_RESIZABLE;

  // if the column is associated with a control change also immediately the flags of the control:
  // if the column is associated with a control change also immediately the flags of the control:

-  wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); // variable definition and initialization
+  wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());

 
   if (dataViewCtrlPtr != NULL)
   {
 
   if (dataViewCtrlPtr != NULL)
   {

-   // variable definition and initialization:

     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-    
+

     if (macDataViewListCtrlPtr != NULL)
     {
     if (macDataViewListCtrlPtr != NULL)
     {

-     // variable definition and initialization:

       DataBrowserListViewHeaderDesc headerDescription;
       DataBrowserListViewHeaderDesc headerDescription;

-      
+

       verify_noerr(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription));
       if (resizeable) {
         headerDescription.minimumWidth = 0;
         headerDescription.maximumWidth = 30000;
       }
       else {
       verify_noerr(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription));
       if (resizeable) {
         headerDescription.minimumWidth = 0;
         headerDescription.maximumWidth = 30000;
       }
       else {

-        headerDescription.minimumWidth = this->m_width;
-        headerDescription.maximumWidth = this->m_width;
+        headerDescription.minimumWidth = m_width;
+        headerDescription.maximumWidth = m_width;

       }
       verify_noerr(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription));
       macDataViewListCtrlPtr->SetSortProperty(this->GetPropertyID());
       }
       verify_noerr(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription));
       macDataViewListCtrlPtr->SetSortProperty(this->GetPropertyID());

-    } /* if */
-  } /* if */
-} /* wxDataViewColumn::SetResizeable(bool) */
+    }
+  }
+}

 
 void wxDataViewColumn::SetSortable(bool sortable)
 {
  // first set the internal flag of the column:
   if (sortable)
 
 void wxDataViewColumn::SetSortable(bool sortable)
 {
  // first set the internal flag of the column:
   if (sortable)

-    this->m_flags |= wxDATAVIEW_COL_SORTABLE;
+    m_flags |= wxDATAVIEW_COL_SORTABLE;

   else
   else

-    this->m_flags &= ~wxDATAVIEW_COL_SORTABLE;
+    m_flags &= ~wxDATAVIEW_COL_SORTABLE;

  // if the column is associated with a control change also immediately the flags of the control:
  // if the column is associated with a control change also immediately the flags of the control:

-  wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); // variable definition and initialization
+  wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());

 
   if (dataViewCtrlPtr != NULL)
   {
 
   if (dataViewCtrlPtr != NULL)
   {

-   // variable definition and initialization:

     DataBrowserPropertyFlags                       flags;
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
     DataBrowserPropertyFlags                       flags;
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-    
+

     wxCHECK_RET(macDataViewListCtrlPtr != NULL,                                                 _("Valid pointer to native data view control does not exist"));
     wxCHECK_RET(macDataViewListCtrlPtr->GetPropertyFlags(this->GetPropertyID(),&flags) == noErr,_("Could not get property flags."));
     if (sortable)
     wxCHECK_RET(macDataViewListCtrlPtr != NULL,                                                 _("Valid pointer to native data view control does not exist"));
     wxCHECK_RET(macDataViewListCtrlPtr->GetPropertyFlags(this->GetPropertyID(),&flags) == noErr,_("Could not get property flags."));
     if (sortable)


@@ -997,25 +899,23 @@ void wxDataViewColumn::SetSortable(bool sortable)
     else
       flags &= ~kDataBrowserListViewSortableColumn;
     wxCHECK_RET(macDataViewListCtrlPtr->SetPropertyFlags(this->GetPropertyID(),flags) == noErr,_("Could not set property flags."));
     else
       flags &= ~kDataBrowserListViewSortableColumn;
     wxCHECK_RET(macDataViewListCtrlPtr->SetPropertyFlags(this->GetPropertyID(),flags) == noErr,_("Could not set property flags."));

-  } /* if */
-} /* wxDataViewColumn::SetSortable(bool) */
+  }
+}

 
 void wxDataViewColumn::SetSortOrder(bool ascending)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 
 
 void wxDataViewColumn::SetSortOrder(bool ascending)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 

-  
-  this->m_ascending = ascending;
+
+  m_ascending = ascending;

   if (dataViewCtrlPtr != NULL)
   {
   if (dataViewCtrlPtr != NULL)
   {

-   // variable definition and initialization:

     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-    
+

     if (macDataViewListCtrlPtr != NULL)
     {
     if (macDataViewListCtrlPtr != NULL)
     {

-     // variable definition and initialization:

       DataBrowserListViewHeaderDesc headerDescription;
       DataBrowserListViewHeaderDesc headerDescription;

-      
+

       verify_noerr(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription));
       if (ascending)
         headerDescription.initialOrder = kDataBrowserOrderIncreasing;
       verify_noerr(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription));
       if (ascending)
         headerDescription.initialOrder = kDataBrowserOrderIncreasing;


@@ -1023,58 +923,67 @@ void wxDataViewColumn::SetSortOrder(bool ascending)
         headerDescription.initialOrder = kDataBrowserOrderDecreasing;
       verify_noerr(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription));
       macDataViewListCtrlPtr->SetSortProperty(this->GetPropertyID());
         headerDescription.initialOrder = kDataBrowserOrderDecreasing;
       verify_noerr(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription));
       macDataViewListCtrlPtr->SetSortProperty(this->GetPropertyID());

-    } /* if */
-  } /* if */
-} /* wxDataViewColumn::SetSortOrder(bool) */
+    }
+  }
+}

 
 void wxDataViewColumn::SetTitle(wxString const& title)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 
 
 void wxDataViewColumn::SetTitle(wxString const& title)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 

-  
-  this->m_title = title;
+
+  m_title = title;

   if (dataViewCtrlPtr != NULL)
   {
   if (dataViewCtrlPtr != NULL)
   {

-   // variable definition and initialization:

     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
     wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-    
+

     if (macDataViewListCtrlPtr != NULL)
     {
     if (macDataViewListCtrlPtr != NULL)
     {

-     // variable definition and initialization:

       DataBrowserListViewHeaderDesc headerDescription;
       DataBrowserListViewHeaderDesc headerDescription;

-#if wxCHECK_VERSION(2,9,0)

       wxCFStringRef           cfTitle(title,(dataViewCtrlPtr->GetFont().Ok() ? dataViewCtrlPtr->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
       wxCFStringRef           cfTitle(title,(dataViewCtrlPtr->GetFont().Ok() ? dataViewCtrlPtr->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));

-#else
-      wxMacCFStringHolder           cfTitle(title,(dataViewCtrlPtr->GetFont().Ok() ? dataViewCtrlPtr->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()));
-#endif
-      
+

       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
       headerDescription.titleString = cfTitle;
       wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not set header description."));
       wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description."));
       headerDescription.titleString = cfTitle;
       wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetPropertyID(),&headerDescription) == noErr,_("Could not set header description."));

-    } /* if */
-  } /* if */
-} /* wxDataViewColumn::SetTitle(wxString const&) */
+    }
+  }
+}

 
 void wxDataViewColumn::SetWidth(int width)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 
 
 void wxDataViewColumn::SetWidth(int width)
 {
   wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner());
 

-  
-  if ((width >= this->m_minWidth) && (width <= this->m_maxWidth))
+
+  if ((width >= m_minWidth) && (width <= m_maxWidth))

   {
   {

-    this->m_width = width;
+    m_width = width;

     if (dataViewCtrlPtr != NULL)
     {
     if (dataViewCtrlPtr != NULL)
     {

-     // variable definition and initialization:

       wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));
       wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(dataViewCtrlPtr->GetPeer()));

-      
+

       if (macDataViewListCtrlPtr != NULL)
         wxCHECK_RET(macDataViewListCtrlPtr->SetColumnWidth(this->GetPropertyID(),static_cast<UInt16>(width)) == noErr,_("Could not set column width."));
       if (macDataViewListCtrlPtr != NULL)
         wxCHECK_RET(macDataViewListCtrlPtr->SetColumnWidth(this->GetPropertyID(),static_cast<UInt16>(width)) == noErr,_("Could not set column width."));

-    } /* if */
-  } /* if */
-} /* wxDataViewColumn::SetWidth(int) */
+    }
+  }
+}
+
+void wxDataViewColumn::SetAsSortKey(bool WXUNUSED(sort))
+{
+    // see wxGTK native wxDataViewColumn implementation
+    wxFAIL_MSG( "not implemented" );
+}
+
+bool wxDataViewColumn::IsSortKey() const
+{
+    wxDataViewCtrl * const dataViewCtrlPtr(GetOwner());
+    wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(
+        dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(
+            dataViewCtrlPtr->GetPeer()));

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn,wxDataViewColumnBase)
+    DataBrowserPropertyID propertyID;
+    return macDataViewListCtrlPtr->GetSortProperty(&propertyID) == noErr &&
+            propertyID == m_propertyID;
+}

 
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl
 
 //-----------------------------------------------------------------------------
 // wxDataViewCtrl


@@ -1086,14 +995,13 @@ wxDataViewCtrl::~wxDataViewCtrl()
    ClearColumns();
 }
 
    ClearColumns();
 }
 

-#pragma mark -

 void wxDataViewCtrl::Init()
 {
 void wxDataViewCtrl::Init()
 {

-  this->m_CustomRendererPtr = NULL;
-  this->m_Deleting          = false;
-  this->m_macIsUserPane     = false;
-  this->m_cgContext         = NULL;
-} /* wxDataViewCtrl::Init() */
+  m_CustomRendererPtr = NULL;
+  m_Deleting          = false;
+  m_macIsUserPane     = false;
+  m_cgContext         = NULL;
+}

 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
 {
 
 bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator )
 {


@@ -1104,20 +1012,20 @@ bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
   MacSetClipChildren(true) ;
 #endif
 
   MacSetClipChildren(true) ;
 #endif
 

-  this->m_peer = new wxMacDataViewDataBrowserListViewControl(this,pos,size,style);
-  
+  m_peer = new wxMacDataViewDataBrowserListViewControl(this,pos,size,style);
+

   if ( style & wxBORDER_NONE )
   if ( style & wxBORDER_NONE )

-    this->m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;
+    m_peer->SetData( kControlNoPart, kControlDataBrowserIncludesFrameAndFocusTag, (Boolean) false ) ;

 
   this->MacPostControlCreate(pos,size);
 
   this->MacPostControlCreate(pos,size);

-  ::SetAutomaticControlDragTrackingEnabledForWindow(::GetControlOwner(this->m_peer->GetControlRef()),true);
+  ::SetAutomaticControlDragTrackingEnabledForWindow(::GetControlOwner(m_peer->GetControlRef()),true);

 
 

-  InstallControlEventHandler(this->m_peer->GetControlRef(),GetwxMacDataViewCtrlEventHandlerUPP(),GetEventTypeCount(eventList),eventList,this,NULL);
+  InstallControlEventHandler(m_peer->GetControlRef(),GetwxMacDataViewCtrlEventHandlerUPP(),GetEventTypeCount(eventList),eventList,this,NULL);
+
+  ::SetDataBrowserTableViewHiliteStyle( m_peer->GetControlRef(), kDataBrowserTableViewFillHilite );

 
 

-  ::SetDataBrowserTableViewHiliteStyle( this->m_peer->GetControlRef(), kDataBrowserTableViewFillHilite );
-  

   return true;
   return true;

-} /* wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator) */
+}

 
 /*static*/
 wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 
 /*static*/
 wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant)


@@ -1135,8 +1043,8 @@ bool wxDataViewCtrl::AssociateModel(wxDataViewModel* model)
 {
   if (!wxDataViewCtrlBase::AssociateModel(model))
     return false;
 {
   if (!wxDataViewCtrlBase::AssociateModel(model))
     return false;

-  
-  model->AddNotifier(new wxMacDataViewModelNotifier(dynamic_cast<wxMacDataViewDataBrowserListViewControl*>(this->m_peer)));
+
+  model->AddNotifier(new wxMacDataViewModelNotifier(dynamic_cast<wxMacDataViewDataBrowserListViewControl*>(m_peer)));

 
   return true;
 }
 
   return true;
 }


@@ -1144,7 +1052,7 @@ bool wxDataViewCtrl::AssociateModel(wxDataViewModel* model)
 bool wxDataViewCtrl::AppendColumn(wxDataViewColumn* columnPtr)
 {
    return InsertColumn( kDataBrowserListViewAppendColumn, columnPtr );
 bool wxDataViewCtrl::AppendColumn(wxDataViewColumn* columnPtr)
 {
    return InsertColumn( kDataBrowserListViewAppendColumn, columnPtr );

-} 
+}

 
 bool wxDataViewCtrl::PrependColumn(wxDataViewColumn* columnPtr)
 {
 
 bool wxDataViewCtrl::PrependColumn(wxDataViewColumn* columnPtr)
 {


@@ -1157,13 +1065,9 @@ bool wxDataViewCtrl::InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr)
 
   DataBrowserPropertyID NewPropertyID;
 
 
   DataBrowserPropertyID NewPropertyID;
 

-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));

 
 

-#if wxCHECK_VERSION(2,9,0)
-  wxCFStringRef title(columnPtr->GetTitle(),this->m_font.Ok() ? this->GetFont().GetEncoding() : wxLocale::GetSystemEncoding());
-#else
-  wxMacCFStringHolder title(columnPtr->GetTitle(),this->m_font.Ok() ? this->GetFont().GetEncoding() : wxLocale::GetSystemEncoding());
-#endif
+  wxCFStringRef title(columnPtr->GetTitle(),m_font.Ok() ? this->GetFont().GetEncoding() : wxLocale::GetSystemEncoding());

 
 
  // first, some error checking:
 
 
  // first, some error checking:


@@ -1180,7 +1084,7 @@ bool wxDataViewCtrl::InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr)
   columnPtr->SetPropertyID(NewPropertyID);
  // add column to wxWidget's internal structure:
   wxCHECK_MSG(this->wxDataViewCtrlBase::AppendColumn(columnPtr) &&
   columnPtr->SetPropertyID(NewPropertyID);
  // add column to wxWidget's internal structure:
   wxCHECK_MSG(this->wxDataViewCtrlBase::AppendColumn(columnPtr) &&

-              this->m_ColumnPointers.insert(ColumnPointerHashMapType::value_type(NewPropertyID,columnPtr)).second,false,_("Could not add column to internal structures."));
+              m_ColumnPointers.insert(ColumnPointerHashMapType::value_type(NewPropertyID,columnPtr)).second,false,_("Could not add column to internal structures."));

  // create a column description and add column to the native control:
   wxCHECK_MSG(::InitializeColumnDescription(columnDescription,columnPtr,NewPropertyID,title),                 false,_("Column description could not be initialized."));
   wxCHECK_MSG(MacDataViewListCtrlPtr->AddColumn(&columnDescription,pos) == noErr,false,_("Column could not be added."));
  // create a column description and add column to the native control:
   wxCHECK_MSG(::InitializeColumnDescription(columnDescription,columnPtr,NewPropertyID,title),                 false,_("Column description could not be initialized."));
   wxCHECK_MSG(MacDataViewListCtrlPtr->AddColumn(&columnDescription,pos) == noErr,false,_("Column could not be added."));


@@ -1195,7 +1099,7 @@ bool wxDataViewCtrl::InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr)
   {
     this->SetExpanderColumn(columnPtr);
     this->AddChildrenLevel(wxDataViewItem());
   {
     this->SetExpanderColumn(columnPtr);
     this->AddChildrenLevel(wxDataViewItem());

-  } /* if */
+  }

   else
     MacDataViewListCtrlPtr->UpdateItems(kDataBrowserNoItem,0,NULL,kDataBrowserItemNoProperty,NewPropertyID);
  // done:
   else
     MacDataViewListCtrlPtr->UpdateItems(kDataBrowserNoItem,0,NULL,kDataBrowserItemNoProperty,NewPropertyID);
  // done:


@@ -1204,205 +1108,219 @@ bool wxDataViewCtrl::InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr)
 
 bool wxDataViewCtrl::ClearColumns()
 {
 
 bool wxDataViewCtrl::ClearColumns()
 {

-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));

 
 

-  
-  while (this->m_ColumnPointers.begin() != this->m_ColumnPointers.end())
+
+  while (m_ColumnPointers.begin() != m_ColumnPointers.end())

   {
   {

-    wxCHECK_MSG(MacDataViewListCtrlPtr->RemoveColumnByProperty(this->m_ColumnPointers.begin()->first) == noErr,false,_("Could not remove column."));
-    delete this->m_ColumnPointers.begin()->second;
-    this->m_ColumnPointers.erase(this->m_ColumnPointers.begin());
-  } /* while */
+    wxCHECK_MSG(MacDataViewListCtrlPtr->RemoveColumnByProperty(m_ColumnPointers.begin()->first) == noErr,false,_("Could not remove column."));
+    delete m_ColumnPointers.begin()->second;
+    m_ColumnPointers.erase(m_ColumnPointers.begin());
+  }

   return true;
   return true;

-} 
+}

 
 bool wxDataViewCtrl::DeleteColumn(wxDataViewColumn* columnPtr)
 {
 
 bool wxDataViewCtrl::DeleteColumn(wxDataViewColumn* columnPtr)
 {

-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));

 
 

-  
-  if ((MacDataViewListCtrlPtr->RemoveColumnByProperty(columnPtr->GetPropertyID()) == noErr) && (this->m_ColumnPointers.erase(columnPtr->GetPropertyID()) > 0))
+
+  if ((MacDataViewListCtrlPtr->RemoveColumnByProperty(columnPtr->GetPropertyID()) == noErr) && (m_ColumnPointers.erase(columnPtr->GetPropertyID()) > 0))

   {
     delete columnPtr;
     return true;
   {
     delete columnPtr;
     return true;

-  } /* if */
+  }

   else
     return false;
   else
     return false;

-} /* wxDataViewCtrl::DeleteColumn(wxDataViewColumn*) */
+}

 
 wxDataViewColumn* wxDataViewCtrl::GetColumn(unsigned int pos) const
 {
   DataBrowserPropertyID propertyID;
 
 wxDataViewColumn* wxDataViewCtrl::GetColumn(unsigned int pos) const
 {
   DataBrowserPropertyID propertyID;

-  
-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));

 
 

-  
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+
+

   if (MacDataViewListCtrlPtr->GetPropertyID(pos,&propertyID) == noErr)
   {
   if (MacDataViewListCtrlPtr->GetPropertyID(pos,&propertyID) == noErr)
   {

-   // variable definition:
-    ColumnPointerHashMapType::const_iterator Result(this->m_ColumnPointers.find(propertyID));
-    
-    if (Result != this->m_ColumnPointers.end())
+    ColumnPointerHashMapType::const_iterator Result(m_ColumnPointers.find(propertyID));
+
+    if (Result != m_ColumnPointers.end())

       return Result->second;
     else
       return NULL;
       return Result->second;
     else
       return NULL;

-  } /* if */
+  }

   else
     return NULL;
   else
     return NULL;

-} /* wxDataViewCtrl::GetColumn(unsigned int pos) const */
+}

 
 unsigned int wxDataViewCtrl::GetColumnCount() const
 {
 
 unsigned int wxDataViewCtrl::GetColumnCount() const
 {

-  return this->m_ColumnPointers.size();
-} /* wxDataViewCtrl::GetColumnCount() const */
+  return m_ColumnPointers.size();
+}

 
 int wxDataViewCtrl::GetColumnPosition(wxDataViewColumn const* columnPtr) const
 {
   if (columnPtr != NULL)
   {
 
 int wxDataViewCtrl::GetColumnPosition(wxDataViewColumn const* columnPtr) const
 {
   if (columnPtr != NULL)
   {

-   // variable definition and initialization:

     DataBrowserTableViewColumnIndex                Position;
     DataBrowserTableViewColumnIndex                Position;

-    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
-    
+    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+

     wxCHECK_MSG(MacDataViewListCtrlPtr->GetColumnIndex(columnPtr->GetPropertyID(),&Position) == noErr,-1,_("Could not determine column's position"));
     return static_cast<int>(Position);
     wxCHECK_MSG(MacDataViewListCtrlPtr->GetColumnIndex(columnPtr->GetPropertyID(),&Position) == noErr,-1,_("Could not determine column's position"));
     return static_cast<int>(Position);

-  } /* if */
+  }

   else
     return wxNOT_FOUND;
   else
     return wxNOT_FOUND;

-} /* wxDataViewCtrl::GetColumnPosition(wxDataViewColumn const*) const */
+}

 
 void wxDataViewCtrl::Collapse(wxDataViewItem const& item)
 {
 
 void wxDataViewCtrl::Collapse(wxDataViewItem const& item)
 {

-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));

 
 
   MacDataViewListCtrlPtr->CloseContainer(reinterpret_cast<DataBrowserItemID>(item.GetID()));
 
 
   MacDataViewListCtrlPtr->CloseContainer(reinterpret_cast<DataBrowserItemID>(item.GetID()));

-} /* wxDataViewCtrl::Collapse(wxDataViewItem const&) */
+}

 
 void wxDataViewCtrl::EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr)
 {
 
 void wxDataViewCtrl::EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr)
 {

+  ExpandAncestors(item);
+

   if (item.IsOk())
   {
   if (item.IsOk())
   {

-   // variable definition and initialization:

     DataBrowserPropertyID propertyID;
     DataBrowserPropertyID propertyID;

-    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
+    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));

 
     if (columnPtr != NULL)
       propertyID = columnPtr->GetPropertyID();
     else
       propertyID = kDataBrowserNoItem;
     MacDataViewListCtrlPtr->RevealItem(reinterpret_cast<DataBrowserItemID>(item.GetID()),propertyID,kDataBrowserRevealOnly);
 
     if (columnPtr != NULL)
       propertyID = columnPtr->GetPropertyID();
     else
       propertyID = kDataBrowserNoItem;
     MacDataViewListCtrlPtr->RevealItem(reinterpret_cast<DataBrowserItemID>(item.GetID()),propertyID,kDataBrowserRevealOnly);

-  } /* if */
-} /* wxDataViewCtrl::EnsureVisible(wxDataViewItem const&, wxDataViewColumn const*) */
+  }
+}

 
 void wxDataViewCtrl::Expand(wxDataViewItem const& item)
 {
 
 void wxDataViewCtrl::Expand(wxDataViewItem const& item)
 {

-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
-  
-  
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+
+

   MacDataViewListCtrlPtr->OpenContainer(reinterpret_cast<DataBrowserItemID>(item.GetID()));
   MacDataViewListCtrlPtr->OpenContainer(reinterpret_cast<DataBrowserItemID>(item.GetID()));

-} /* wxDataViewCtrl::Expand(wxDataViewItem const&) */
+}
+
+bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const
+{
+  if (item.IsOk())
+  {
+    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+
+    DataBrowserItemState state = 0;
+    OSStatus err = ::GetDataBrowserItemState( 
+       MacDataViewListCtrlPtr->GetControlRef(), 
+       reinterpret_cast<DataBrowserItemID>(item.GetID()),
+       &state );
+    if ((err == 0) && (state & kDataBrowserContainerIsOpen))
+       return true;
+  }
+  return false;
+}

 
 wxDataViewColumn* wxDataViewCtrl::GetSortingColumn() const
 {
   DataBrowserPropertyID propertyID;
 
 
 wxDataViewColumn* wxDataViewCtrl::GetSortingColumn() const
 {
   DataBrowserPropertyID propertyID;
 

-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
-  
-  
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+
+

   if (MacDataViewListCtrlPtr->GetSortProperty(&propertyID) == noErr)
     return this->GetColumnPtr(propertyID);
   else
     return NULL;
   if (MacDataViewListCtrlPtr->GetSortProperty(&propertyID) == noErr)
     return this->GetColumnPtr(propertyID);
   else
     return NULL;

-} /* wxDataViewCtrl::GetSortingColumn() const */
+}

 
 unsigned int wxDataViewCtrl::GetCount() const
 {
   ItemCount noOfItems;
 
 
 
 unsigned int wxDataViewCtrl::GetCount() const
 {
   ItemCount noOfItems;
 
 

-  wxCHECK_MSG(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer)->GetItemCount(&noOfItems) == noErr,0,_("Could not determine number of items"));
+  wxCHECK_MSG(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer)->GetItemCount(&noOfItems) == noErr,0,_("Could not determine number of items"));

   return noOfItems;
   return noOfItems;

-} /* wxDataViewCtrl::GetCount() const */
+}

 
 wxRect wxDataViewCtrl::GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const
 {
   if (item.IsOk() && (columnPtr != NULL))
   {
 
 wxRect wxDataViewCtrl::GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const
 {
   if (item.IsOk() && (columnPtr != NULL))
   {

-   // variable definition:

     Rect                                           MacRectangle;
     Rect                                           MacRectangle;

-    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
-    
+    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+

     if (MacDataViewListCtrlPtr->GetPartBounds(reinterpret_cast<DataBrowserItemID>(item.GetID()),columnPtr->GetPropertyID(),kDataBrowserPropertyContentPart,&MacRectangle) == noErr)
     {
     if (MacDataViewListCtrlPtr->GetPartBounds(reinterpret_cast<DataBrowserItemID>(item.GetID()),columnPtr->GetPropertyID(),kDataBrowserPropertyContentPart,&MacRectangle) == noErr)
     {

-     // variable definition:

       wxRect rectangle;
       wxRect rectangle;

-      
+

       ::wxMacNativeToRect(&MacRectangle,&rectangle);
       return rectangle;
       ::wxMacNativeToRect(&MacRectangle,&rectangle);
       return rectangle;

-    } /* if */
+    }

     else
       return wxRect();
     else
       return wxRect();

-  } /* if */
+  }

   else
     return wxRect();
   else
     return wxRect();

-} /* wxDataViewCtrl::GetItemRect(wxDataViewItem const&, unsigned int) const */
+}

 
 wxDataViewItem wxDataViewCtrl::GetSelection() const
 {
   wxArrayDataBrowserItemID itemIDs;
 
 wxDataViewItem wxDataViewCtrl::GetSelection() const
 {
   wxArrayDataBrowserItemID itemIDs;

-  
-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));

 
 

-  
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+
+

   if (MacDataViewListCtrlPtr->GetSelectedItemIDs(itemIDs) > 0)
     return wxDataViewItem(reinterpret_cast<void*>(itemIDs[0]));
   else
     return wxDataViewItem();
   if (MacDataViewListCtrlPtr->GetSelectedItemIDs(itemIDs) > 0)
     return wxDataViewItem(reinterpret_cast<void*>(itemIDs[0]));
   else
     return wxDataViewItem();

-} /* wxDataViewCtrl::GetSelection() const */
+}

 
 int wxDataViewCtrl::GetSelections(wxDataViewItemArray& sel) const
 {
   size_t NoOfSelectedItems;
 
   wxArrayDataBrowserItemID itemIDs;
 
 int wxDataViewCtrl::GetSelections(wxDataViewItemArray& sel) const
 {
   size_t NoOfSelectedItems;
 
   wxArrayDataBrowserItemID itemIDs;

-  
-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
-  
-  
+
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+
+

   NoOfSelectedItems = MacDataViewListCtrlPtr->GetSelectedItemIDs(itemIDs);
   sel.Empty();
   sel.SetCount(NoOfSelectedItems);
   for (size_t i=0; i<NoOfSelectedItems; ++i)
     sel[i] = wxDataViewItem(reinterpret_cast<void*>(itemIDs[i]));
   return static_cast<int>(NoOfSelectedItems);
   NoOfSelectedItems = MacDataViewListCtrlPtr->GetSelectedItemIDs(itemIDs);
   sel.Empty();
   sel.SetCount(NoOfSelectedItems);
   for (size_t i=0; i<NoOfSelectedItems; ++i)
     sel[i] = wxDataViewItem(reinterpret_cast<void*>(itemIDs[i]));
   return static_cast<int>(NoOfSelectedItems);

-} /* wxDataViewCtrl::GetSelections(wxDataViewItemArray&) const */
+}

 
 void wxDataViewCtrl::HitTest(wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
 {
   item = wxDataViewItem();
   columnPtr = NULL;
 
 void wxDataViewCtrl::HitTest(wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
 {
   item = wxDataViewItem();
   columnPtr = NULL;

-} /* wxDataViewCtrl::HitTest(wxPoint const&, wxDataViewItem&, wxDataViewColumn*&) const */
+}

 
 bool wxDataViewCtrl::IsSelected(wxDataViewItem const& item) const
 {
 
 bool wxDataViewCtrl::IsSelected(wxDataViewItem const& item) const
 {

-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
-  
-  
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+
+

   return MacDataViewListCtrlPtr->IsItemSelected(reinterpret_cast<DataBrowserItemID>(item.GetID()));
   return MacDataViewListCtrlPtr->IsItemSelected(reinterpret_cast<DataBrowserItemID>(item.GetID()));

-} /* wxDataViewCtrl::IsSelected(wxDataViewItem const&) const */
+}

 
 void wxDataViewCtrl::SelectAll()
 {
   DataBrowserItemID* itemIDPtr;
 
   Handle handle(::NewHandle(0));
 
 void wxDataViewCtrl::SelectAll()
 {
   DataBrowserItemID* itemIDPtr;
 
   Handle handle(::NewHandle(0));

-  
+

   size_t NoOfItems;
   size_t NoOfItems;

-  
-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
-  
-  
+
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+
+

   wxCHECK_RET(MacDataViewListCtrlPtr->GetItems(kDataBrowserNoItem,true,kDataBrowserItemAnyState,handle) == noErr,_("Could not get items."));
   NoOfItems = static_cast<size_t>(::GetHandleSize(handle)/sizeof(DataBrowserItemID));
   HLock(handle);
   wxCHECK_RET(MacDataViewListCtrlPtr->GetItems(kDataBrowserNoItem,true,kDataBrowserItemAnyState,handle) == noErr,_("Could not get items."));
   NoOfItems = static_cast<size_t>(::GetHandleSize(handle)/sizeof(DataBrowserItemID));
   HLock(handle);


@@ -1410,59 +1328,72 @@ void wxDataViewCtrl::SelectAll()
   MacDataViewListCtrlPtr->SetSelectedItems(NoOfItems,itemIDPtr,kDataBrowserItemsAssign);
   HUnlock(handle);
   DisposeHandle(handle);
   MacDataViewListCtrlPtr->SetSelectedItems(NoOfItems,itemIDPtr,kDataBrowserItemsAssign);
   HUnlock(handle);
   DisposeHandle(handle);

-} /* wxDataViewCtrl::SelectAll() */
+}

 
 void wxDataViewCtrl::Select(wxDataViewItem const& item)
 {
   if (item.IsOk())
   {
 
 void wxDataViewCtrl::Select(wxDataViewItem const& item)
 {
   if (item.IsOk())
   {

-   // variable definition and initialization:
-    DataBrowserItemID                              itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));
-    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
+    ExpandAncestors(item);

   
   

+    DataBrowserItemID                              itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));
+    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+

     MacDataViewListCtrlPtr->SetSelectedItems(1,&itemID,kDataBrowserItemsAdd);
     MacDataViewListCtrlPtr->SetSelectedItems(1,&itemID,kDataBrowserItemsAdd);

-  } /* if */
-} /* wxDataViewCtrl::Select(wxDataViewItem const&) */
+  }
+}

 
 void wxDataViewCtrl::SetSelections(wxDataViewItemArray const& sel)
 {
 
 void wxDataViewCtrl::SetSelections(wxDataViewItemArray const& sel)
 {

-  size_t const NoOfSelections = sel.GetCount();
+    size_t const NoOfSelections = sel.GetCount();

 
 

-  DataBrowserItemID* itemIDs;
+    wxDataViewItem last_parent;

 
 

-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
-  
-  
-  itemIDs = new DataBrowserItemID[NoOfSelections];
-  for (size_t i=0; i<NoOfSelections; ++i)
-    itemIDs[i] = reinterpret_cast<DataBrowserItemID>(sel[i].GetID());
-  MacDataViewListCtrlPtr->SetSelectedItems(NoOfSelections,itemIDs,kDataBrowserItemsAssign);
-  delete[] itemIDs;
-} /* wxDataViewCtrl::SetSelections(wxDataViewItemArray const&) */
+    size_t i;
+    for (i = 0; i < NoOfSelections; i++)
+    {
+        wxDataViewItem item = sel[i];
+        wxDataViewItem parent = GetModel()->GetParent( item );
+        if (parent)
+        {
+            if (parent != last_parent)
+                ExpandAncestors(item);
+        }
+        last_parent = parent;
+    }
+
+    DataBrowserItemID* itemIDs;
+    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+
+    itemIDs = new DataBrowserItemID[NoOfSelections];
+    for (i=0; i<NoOfSelections; ++i)
+      itemIDs[i] = reinterpret_cast<DataBrowserItemID>(sel[i].GetID());
+    MacDataViewListCtrlPtr->SetSelectedItems(NoOfSelections,itemIDs,kDataBrowserItemsAssign);
+    delete[] itemIDs;
+}

 
 void wxDataViewCtrl::Unselect(wxDataViewItem const& item)
 {
   if (item.IsOk())
   {
 
 void wxDataViewCtrl::Unselect(wxDataViewItem const& item)
 {
   if (item.IsOk())
   {

-   // variable definition and initialization:

     DataBrowserItemID                              itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));
     DataBrowserItemID                              itemID(reinterpret_cast<DataBrowserItemID>(item.GetID()));

-    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
-  
+    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+

     MacDataViewListCtrlPtr->SetSelectedItems(1,&itemID,kDataBrowserItemsRemove);
     MacDataViewListCtrlPtr->SetSelectedItems(1,&itemID,kDataBrowserItemsRemove);

-  } /* if */
-} /* wxDataViewCtrl::Unselect(wxDataViewItem const&) */
+  }
+}

 
 void wxDataViewCtrl::UnselectAll()
 {
   DataBrowserItemID* itemIDPtr;
 
 void wxDataViewCtrl::UnselectAll()
 {
   DataBrowserItemID* itemIDPtr;

-  
+

   Handle handle(::NewHandle(0));
   Handle handle(::NewHandle(0));

-  
+

   size_t NoOfItems;
   size_t NoOfItems;

-  
-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
-  
-  
+
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));
+
+

   wxCHECK_RET(MacDataViewListCtrlPtr->GetItems(kDataBrowserNoItem,true,kDataBrowserItemAnyState,handle) == noErr,_("Could not get items."));
   NoOfItems = static_cast<size_t>(::GetHandleSize(handle)/sizeof(DataBrowserItemID));
   HLock(handle);
   wxCHECK_RET(MacDataViewListCtrlPtr->GetItems(kDataBrowserNoItem,true,kDataBrowserItemAnyState,handle) == noErr,_("Could not get items."));
   NoOfItems = static_cast<size_t>(::GetHandleSize(handle)/sizeof(DataBrowserItemID));
   HLock(handle);


@@ -1470,7 +1401,7 @@ void wxDataViewCtrl::UnselectAll()
   MacDataViewListCtrlPtr->SetSelectedItems(NoOfItems,itemIDPtr,kDataBrowserItemsRemove);
   HUnlock(handle);
   DisposeHandle(handle);
   MacDataViewListCtrlPtr->SetSelectedItems(NoOfItems,itemIDPtr,kDataBrowserItemsRemove);
   HUnlock(handle);
   DisposeHandle(handle);

-} /* wxDataViewCtrl::UnselectAll() */
+}

 
 // data handling:
 void wxDataViewCtrl::AddChildrenLevel(wxDataViewItem const& parentItem)
 
 // data handling:
 void wxDataViewCtrl::AddChildrenLevel(wxDataViewItem const& parentItem)


@@ -1478,8 +1409,8 @@ void wxDataViewCtrl::AddChildrenLevel(wxDataViewItem const& parentItem)
   int NoOfChildren;
 
   wxDataViewItemArray items;
   int NoOfChildren;
 
   wxDataViewItemArray items;

-  
-  
+
+

   wxCHECK_RET(this->GetModel() != NULL,_("Model pointer not initialized."));
   NoOfChildren = this->GetModel()->GetChildren(parentItem,items);
 #if 0
   wxCHECK_RET(this->GetModel() != NULL,_("Model pointer not initialized."));
   NoOfChildren = this->GetModel()->GetChildren(parentItem,items);
 #if 0


@@ -1488,7 +1419,7 @@ void wxDataViewCtrl::AddChildrenLevel(wxDataViewItem const& parentItem)
 #else
   (void) this->GetModel()->ItemsAdded(parentItem,items);
 #endif
 #else
   (void) this->GetModel()->ItemsAdded(parentItem,items);
 #endif

-} 
+}

 
 void wxDataViewCtrl::FinishCustomItemEditing()
 {
 
 void wxDataViewCtrl::FinishCustomItemEditing()
 {


@@ -1498,37 +1429,35 @@ void wxDataViewCtrl::FinishCustomItemEditing()
     this->SetCustomRendererItem(wxDataViewItem());
     this->SetCustomRendererPtr (NULL);
   }
     this->SetCustomRendererItem(wxDataViewItem());
     this->SetCustomRendererPtr (NULL);
   }

-} 
+}

 
 wxDataViewColumn* wxDataViewCtrl::GetColumnPtr(WXDataBrowserPropertyID propertyID) const
 {
 
 wxDataViewColumn* wxDataViewCtrl::GetColumnPtr(WXDataBrowserPropertyID propertyID) const
 {

- // variable definition:
-  ColumnPointerHashMapType::const_iterator Result(this->m_ColumnPointers.find(propertyID));
-  
-  if (Result != this->m_ColumnPointers.end())
+  ColumnPointerHashMapType::const_iterator Result(m_ColumnPointers.find(propertyID));
+
+  if (Result != m_ColumnPointers.end())

     return Result->second;
   else
     return NULL;
     return Result->second;
   else
     return NULL;

-} 
+}

 
 // inherited methods from wxDataViewCtrlBase
 void wxDataViewCtrl::DoSetExpanderColumn()
 {
   if (this->GetExpanderColumn() != NULL)
   {
 
 // inherited methods from wxDataViewCtrlBase
 void wxDataViewCtrl::DoSetExpanderColumn()
 {
   if (this->GetExpanderColumn() != NULL)
   {

-   // variable definition and initialization:
-    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
+    wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));

 
     (void) MacDataViewListCtrlPtr->SetDisclosureColumn(this->GetExpanderColumn()->GetPropertyID(),false); // second parameter explicitely passed to ensure that arrow is centered
 
     (void) MacDataViewListCtrlPtr->SetDisclosureColumn(this->GetExpanderColumn()->GetPropertyID(),false); // second parameter explicitely passed to ensure that arrow is centered

-  } 
-} 
+  }
+}

 
 void wxDataViewCtrl::DoSetIndent()
 {
 
 void wxDataViewCtrl::DoSetIndent()
 {

-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));  
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));

 
   (void) MacDataViewListCtrlPtr->SetIndent(static_cast<float>(this->GetIndent()));
 
   (void) MacDataViewListCtrlPtr->SetIndent(static_cast<float>(this->GetIndent()));

-} 
+}

 
 // event handling:
 void wxDataViewCtrl::OnSize(wxSizeEvent& event)
 
 // event handling:
 void wxDataViewCtrl::OnSize(wxSizeEvent& event)


@@ -1538,20 +1467,18 @@ void wxDataViewCtrl::OnSize(wxSizeEvent& event)
 
   for (unsigned int i=0; i<NoOfColumns; ++i)
   {
 
   for (unsigned int i=0; i<NoOfColumns; ++i)
   {

-   // variable definition and initialization:

     wxDataViewColumn* dataViewColumnPtr(this->GetColumn(i));
     wxDataViewColumn* dataViewColumnPtr(this->GetColumn(i));

-    
+

     if (dataViewColumnPtr != NULL)
     {
     if (dataViewColumnPtr != NULL)
     {

-     // variable definition and initialization:

       wxDataViewCustomRenderer* dataViewCustomRendererPtr(dynamic_cast<wxDataViewCustomRenderer*>(dataViewColumnPtr->GetRenderer()));
       wxDataViewCustomRenderer* dataViewCustomRendererPtr(dynamic_cast<wxDataViewCustomRenderer*>(dataViewColumnPtr->GetRenderer()));

-    
+

       if (dataViewCustomRendererPtr != NULL)
         dataViewCustomRendererPtr->SetDC(NULL); // reset DC because DC has changed
       if (dataViewCustomRendererPtr != NULL)
         dataViewCustomRendererPtr->SetDC(NULL); // reset DC because DC has changed

-    } /* if */
-  } /* for */
-  
-  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(this->m_peer));
+    }
+  }
+
+  wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(m_peer));

   ControlRef ref = MacDataViewListCtrlPtr->GetControlRef();
   if (NoOfColumns == 1)
   {
   ControlRef ref = MacDataViewListCtrlPtr->GetControlRef();
   if (NoOfColumns == 1)
   {


@@ -1562,9 +1489,9 @@ void wxDataViewCtrl::OnSize(wxSizeEvent& event)
   {
      ::SetDataBrowserHasScrollBars( ref, true, true );
   }
   {
      ::SetDataBrowserHasScrollBars( ref, true, true );
   }

-  
+

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

-} /* wxDataViewCtrl::OnSize(wxSizeEvent&) */
+}

 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl,wxDataViewCtrlBase)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl,wxDataViewCtrlBase)
 


@@ -1572,9 +1499,7 @@ BEGIN_EVENT_TABLE(wxDataViewCtrl,wxDataViewCtrlBase)
   EVT_SIZE(wxDataViewCtrl::OnSize)
 END_EVENT_TABLE()
 
   EVT_SIZE(wxDataViewCtrl::OnSize)
 END_EVENT_TABLE()
 

-#endif
-    // !wxUSE_GENERICDATAVIEWCTRL
+#endif // !wxUSE_GENERICDATAVIEWCTRL

 
 

-#endif
-    // wxUSE_DATAVIEWCTRL
+#endif // wxUSE_DATAVIEWCTRL