Remove wxOSX/Carbon support.

Cocoa has been the default toolkit in wxWidgets for a long time. There is really no good reason to use Carbon in 2016 and this removes a lot of unused and unmaintained code.
This commit is contained in:
Tobias Taschner
2016-01-22 15:40:58 +01:00
parent 8d42890df4
commit 5ba67c67e4
144 changed files with 75 additions and 35011 deletions

View File

@@ -19,9 +19,6 @@
#include "wx/dcclient.h"
#include "wx/icon.h"
#endif
#if wxOSX_USE_CARBON
#include "wx/osx/carbon/dataview.h"
#endif
#include "wx/osx/core/dataview.h"
#include "wx/osx/private.h"
@@ -736,52 +733,6 @@ wxSize wxDataViewCtrl::DoGetBestSize() const
void wxDataViewCtrl::OnMouse(wxMouseEvent& event)
{
event.Skip();
#if wxOSX_USE_CARBON
if (GetModel() == NULL)
return;
wxMacDataViewDataBrowserListViewControlPointer MacDataViewListCtrlPtr(dynamic_cast<wxMacDataViewDataBrowserListViewControlPointer>(GetPeer()));
int NoOfChildren;
wxDataViewItemArray items;
NoOfChildren = GetModel()->GetChildren( wxDataViewItem(), items);
if (NoOfChildren == 0)
return;
wxDataViewItem firstChild = items[0];
UInt16 headerHeight = 0;
MacDataViewListCtrlPtr->GetHeaderButtonHeight(&headerHeight);
if (event.GetY() < headerHeight)
{
unsigned int col_count = GetColumnCount();
unsigned int col;
for (col = 0; col < col_count; col++)
{
wxDataViewColumn *column = GetColumn( col );
if (column->IsHidden())
continue;
Rect itemrect;
::GetDataBrowserItemPartBounds( MacDataViewListCtrlPtr->GetControlRef(),
reinterpret_cast<DataBrowserItemID>(firstChild.GetID()), column->GetNativeData()->GetPropertyID(),
kDataBrowserPropertyEnclosingPart, &itemrect );
if (abs( event.GetX() - itemrect.right) < 3)
{
if (column->GetFlags() & wxDATAVIEW_COL_RESIZABLE)
SetCursor( wxCursor( wxCURSOR_SIZEWE ) );
else
SetCursor( *wxSTANDARD_CURSOR );
return;
}
}
}
SetCursor( *wxSTANDARD_CURSOR );
#endif
}
wxIMPLEMENT_DYNAMIC_CLASS(wxDataViewCtrl,wxDataViewCtrlBase);