Compilation fix for ANSI build after r61898.

[wxWidgets.git] / src / osx / dataview_osx.cpp

diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp
index 69e1b27925cdad86c4bc69b3e004fc04c4aa9453..f2140e4e369a5fc3a18c1f74ea35b4ba76017c86 100644 (file)
--- a/src/osx/dataview_osx.cpp
+++ b/src/osx/dataview_osx.cpp
@@ -12,7 +12,6 @@
 
 #if (wxUSE_DATAVIEWCTRL != 0) && (!defined(wxUSE_GENERICDATAVIEWCTRL) || (wxUSE_GENERICDATAVIEWCTRL == 0))
 
 
 #if (wxUSE_DATAVIEWCTRL != 0) && (!defined(wxUSE_GENERICDATAVIEWCTRL) || (wxUSE_GENERICDATAVIEWCTRL == 0))
 

-#include <carbon/carbon.h>

 #include <limits>
 
 #ifndef WX_PRECOMP
 #include <limits>
 
 #ifndef WX_PRECOMP


@@ -38,7 +37,7 @@ wxString ConcatenateDataViewItemValues(wxDataViewCtrl const* dataViewCtrlPtr, wx
   {
    // variable definition:
     wxVariant dataValue;
   {
    // variable definition:
     wxVariant dataValue;

-    
+

     dataViewCtrlPtr->GetModel()->GetValue(dataValue,dataViewItem,dataViewCtrlPtr->GetColumn(i)->GetModelColumn());
     if (i > 0)
       dataString << wxT('\t');
     dataViewCtrlPtr->GetModel()->GetValue(dataValue,dataViewItem,dataViewCtrlPtr->GetColumn(i)->GetModelColumn());
     if (i > 0)
       dataString << wxT('\t');


@@ -239,7 +238,7 @@ void wxOSXDataViewModelNotifier::AdjustRowHeight(wxDataViewItem const& item)
       for (col = 0; col < num; col++)
       {
           wxDataViewColumn* column(this->m_DataViewCtrlPtr->GetColumnPtr(col));
       for (col = 0; col < num; col++)
       {
           wxDataViewColumn* column(this->m_DataViewCtrlPtr->GetColumnPtr(col));

-          
+

           if (!(column->IsHidden()))
           {
             wxDataViewCustomRenderer *renderer = dynamic_cast<wxDataViewCustomRenderer*>(column->GetRenderer());
           if (!(column->IsHidden()))
           {
             wxDataViewCustomRenderer *renderer = dynamic_cast<wxDataViewCustomRenderer*>(column->GetRenderer());


@@ -274,7 +273,7 @@ void wxOSXDataViewModelNotifier::AdjustRowHeights(wxDataViewItemArray const& ite
         for (col = 0; col < num; col++)
         {
             wxDataViewColumn* column(this->m_DataViewCtrlPtr->GetColumnPtr(col));
         for (col = 0; col < num; col++)
         {
             wxDataViewColumn* column(this->m_DataViewCtrlPtr->GetColumnPtr(col));

-            
+

             if (!(column->IsHidden()))
             {
               wxDataViewCustomRenderer *renderer = dynamic_cast<wxDataViewCustomRenderer*>(column->GetRenderer());
             if (!(column->IsHidden()))
             {
               wxDataViewCustomRenderer *renderer = dynamic_cast<wxDataViewCustomRenderer*>(column->GetRenderer());


@@ -627,7 +626,8 @@ void wxDataViewCtrl::FinishCustomItemEditing(void)
 }
 
 /*static*/
 }
 
 /*static*/

-wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+wxVisualAttributes
+wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
     wxVisualAttributes attr;
 
 {
     wxVisualAttributes attr;
 


@@ -680,14 +680,14 @@ wxSize wxDataViewCtrl::DoGetBestSize() const
 {
     wxSize best = wxControl::DoGetBestSize();
     best.y = 80;
 {
     wxSize best = wxControl::DoGetBestSize();
     best.y = 80;

-    
+

     return best;
 }
 
 void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
 {
     event.Skip();
     return best;
 }
 
 void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
 {
     event.Skip();

-    
+

     if (GetModel() == NULL)
         return;
 
     if (GetModel() == NULL)
         return;
 


@@ -704,8 +704,8 @@ void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
 
     UInt16 headerHeight = 0;
     MacDataViewListCtrlPtr->GetHeaderButtonHeight(&headerHeight);
 
     UInt16 headerHeight = 0;
     MacDataViewListCtrlPtr->GetHeaderButtonHeight(&headerHeight);

-  
-    
+
+

     if (event.GetY() < headerHeight)
     {
        unsigned int col_count = GetColumnCount();
     if (event.GetY() < headerHeight)
     {
        unsigned int col_count = GetColumnCount();


@@ -715,12 +715,12 @@ void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
            wxDataViewColumn *column = GetColumn( col );
            if (column->IsHidden())
               continue;
            wxDataViewColumn *column = GetColumn( col );
            if (column->IsHidden())
               continue;

-           
+

            Rect itemrect;
            Rect itemrect;

-           ::GetDataBrowserItemPartBounds( MacDataViewListCtrlPtr->GetControlRef(), 
+           ::GetDataBrowserItemPartBounds( MacDataViewListCtrlPtr->GetControlRef(),

               reinterpret_cast<DataBrowserItemID>(firstChild.GetID()), column->GetPropertyID(),
               kDataBrowserPropertyEnclosingPart, &itemrect );
               reinterpret_cast<DataBrowserItemID>(firstChild.GetID()), column->GetPropertyID(),
               kDataBrowserPropertyEnclosingPart, &itemrect );

-           
+

            if (abs( event.GetX() - itemrect.right) < 3)
            {
                if (column->GetFlags() & wxDATAVIEW_COL_RESIZABLE)
            if (abs( event.GetX() - itemrect.right) < 3)
            {
                if (column->GetFlags() & wxDATAVIEW_COL_RESIZABLE)


@@ -730,9 +730,9 @@ void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
                return;
            }
        }
                return;
            }
        }

-       
+

     }
     }

-    
+

     SetCursor( *wxSTANDARD_CURSOR );
 #endif
 }
     SetCursor( *wxSTANDARD_CURSOR );
 #endif
 }