Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix many mostly harmless warnings in wxOSX/Carbon build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-20 00:21:53 +00:00
parent 3c01c59511
commit 8f2a8de6e7
10 changed files with 186 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/osx/dataview.h
View File

@@ -74,7 +74,7 @@ public:
return this->m_NativeDataPtr; return this->m_NativeDataPtr;
} }
virtual bool Render() = 0; // a call to the native data browser function to render the data; virtual bool MacRender() = 0; // a call to the native data browser function to render the data;
// returns true if the data value could be rendered, false otherwise // returns true if the data value could be rendered, false otherwise
void SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr); void SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr);
@@ -150,7 +150,7 @@ public:
// //
// implementation // implementation
// //
virtual bool Render(); virtual bool MacRender();
void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
@@ -184,7 +184,7 @@ public:
// //
// inherited functions from wxDataViewRenderer // inherited functions from wxDataViewRenderer
// //
virtual bool Render(); virtual bool MacRender();
protected: protected:
private: private:
@@ -222,7 +222,7 @@ public:
// //
// inherited functions from wxDataViewRenderer // inherited functions from wxDataViewRenderer
// //
virtual bool Render(); virtual bool MacRender();
protected: protected:
private: private:
@@ -247,7 +247,7 @@ public:
// //
// inherited functions from wxDataViewRenderer // inherited functions from wxDataViewRenderer
// //
virtual bool Render(); virtual bool MacRender();
// //
// implementation // implementation
@@ -283,7 +283,7 @@ public:
// //
// inherited functions from wxDataViewRenderer // inherited functions from wxDataViewRenderer
// //
virtual bool Render(); virtual bool MacRender();
protected: protected:
private: private:
@@ -302,7 +302,7 @@ public:
// //
// inherited functions from wxDataViewRenderer // inherited functions from wxDataViewRenderer
// //
virtual bool Render(); virtual bool MacRender();
protected: protected:
private: private:
@@ -322,7 +322,7 @@ public:
// //
// inherited functions from wxDataViewRenderer // inherited functions from wxDataViewRenderer
// //
virtual bool Render(); virtual bool MacRender();
protected: protected:
private: private:
@@ -341,7 +341,7 @@ public:
// //
// inherited functions from wxDataViewRenderer // inherited functions from wxDataViewRenderer
// //
virtual bool Render(); virtual bool MacRender();
protected: protected:
private: private:

2
src/common/imagtiff.cpp
View File

@@ -312,7 +312,7 @@ bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
return false; return false;
} }
raster = (uint32*) _TIFFmalloc( bytesNeeded ); raster = (uint32*) _TIFFmalloc( (uint32)bytesNeeded );
if (!raster) if (!raster)
{ {

4
src/generic/datectlg.cpp
View File

@@ -260,8 +260,8 @@ private:
if (year_cnt == 1 && month_cnt == 1 && day_cnt == 1) if (year_cnt == 1 && month_cnt == 1 && day_cnt == 1)
return fmt; return fmt;
else
return x_format; return x_format;
} }
bool SetFormat(const wxString& fmt) bool SetFormat(const wxString& fmt)

2
src/osx/carbon/app.cpp
View File

@@ -508,7 +508,7 @@ wxMenu* wxFindMenuFromMacCommand( const HICommand &command , wxMenuItem* &item )
} }
else else
{ {
URefCon refCon = NULL ; URefCon refCon = 0 ;
GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ; GetMenuItemRefCon( command.menu.menuRef , command.menu.menuItemIndex , &refCon ) ;
itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ; itemMenu = wxFindMenuFromMacMenu( command.menu.menuRef ) ;

239
src/osx/carbon/dataview.cpp
View File

@@ -224,7 +224,7 @@ pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserCompareProc(ControlR
if (ControlPtr != NULL) if (ControlPtr != NULL)
return ControlPtr->DataBrowserCompareProc(itemOneID,itemTwoID,sortProperty); return ControlPtr->DataBrowserCompareProc(itemOneID,itemTwoID,sortProperty);
else else
return errDataBrowserPropertyNotSupported; return FALSE;
} /* wxMacDataBrowserTableViewControl::DataBrowserCompareProc(ControlRef, DataBrowserItemID, DataBrowserItemID, DataBrowserPropertyID) */ } /* wxMacDataBrowserTableViewControl::DataBrowserCompareProc(ControlRef, DataBrowserItemID, DataBrowserItemID, DataBrowserPropertyID) */
pascal void wxMacDataBrowserTableViewControl::DataBrowserGetContextualMenuProc(ControlRef browser, MenuRef* menu, UInt32* helpType, CFStringRef* helpItemString, AEDesc* selection) pascal void wxMacDataBrowserTableViewControl::DataBrowserGetContextualMenuProc(ControlRef browser, MenuRef* menu, UInt32* helpType, CFStringRef* helpItemString, AEDesc* selection)
@@ -289,30 +289,30 @@ pascal DataBrowserTrackingResult wxMacDataBrowserTableViewControl::DataBrowserTr
if (ControlPtr != NULL) if (ControlPtr != NULL)
return ControlPtr->DataBrowserTrackingProc(itemID,propertyID,theRect,startPt,modifiers); return ControlPtr->DataBrowserTrackingProc(itemID,propertyID,theRect,startPt,modifiers);
else else
return kDataBrowserNothingHit; return kDataBrowserNothingHit;
} /* wxMacDataBrowserTableViewControl::DataBrowserTrackingProc(ControlRef, DataBrowserItemID, DataBrowserPropertyID, Rect const*, Point, EventModifiers) */ } /* wxMacDataBrowserTableViewControl::DataBrowserTrackingProc(ControlRef, DataBrowserItemID, DataBrowserPropertyID, Rect const*, Point, EventModifiers) */
pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserAcceptDragProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID) pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserAcceptDragProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID)
{ {
wxMacDataBrowserTableViewControl* controlPtr(dynamic_cast<wxMacDataBrowserTableViewControl*>(wxMacControl::GetReferenceFromNativeControl(browser))); wxMacDataBrowserTableViewControl* controlPtr(dynamic_cast<wxMacDataBrowserTableViewControl*>(wxMacControl::GetReferenceFromNativeControl(browser)));
return ((controlPtr != NULL) && controlPtr->DataBrowserAcceptDragProc(dragRef,itemID)); return ((controlPtr != NULL) && controlPtr->DataBrowserAcceptDragProc(dragRef,itemID));
} /* wxMacDataBrowserTableViewControl::DataBrowserAcceptDragProc(ControlRef, DragReference, DataBrowserItemID) */ } /* wxMacDataBrowserTableViewControl::DataBrowserAcceptDragProc(ControlRef, DragReference, DataBrowserItemID) */
pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserAddDragItemProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID, ItemReference* itemRef) pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserAddDragItemProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID, ItemReference* itemRef)
{ {
wxMacDataBrowserTableViewControl* controlPtr(dynamic_cast<wxMacDataBrowserTableViewControl*>(wxMacControl::GetReferenceFromNativeControl(browser))); wxMacDataBrowserTableViewControl* controlPtr(dynamic_cast<wxMacDataBrowserTableViewControl*>(wxMacControl::GetReferenceFromNativeControl(browser)));
return ((controlPtr != NULL) && controlPtr->DataBrowserAddDragItemProc(dragRef,itemID,itemRef)); return ((controlPtr != NULL) && controlPtr->DataBrowserAddDragItemProc(dragRef,itemID,itemRef));
} /* wxMacDataBrowserTableViewControl::DataBrowserAddDragItemProc(ControlRef, DragReference, DataBrowserItemID, ItemReference*) */ } /* wxMacDataBrowserTableViewControl::DataBrowserAddDragItemProc(ControlRef, DragReference, DataBrowserItemID, ItemReference*) */
pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserReceiveDragProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID) pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserReceiveDragProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID)
{ {
wxMacDataBrowserTableViewControl* controlPtr(dynamic_cast<wxMacDataBrowserTableViewControl*>(wxMacControl::GetReferenceFromNativeControl(browser))); wxMacDataBrowserTableViewControl* controlPtr(dynamic_cast<wxMacDataBrowserTableViewControl*>(wxMacControl::GetReferenceFromNativeControl(browser)));
return ((controlPtr != NULL) && controlPtr->DataBrowserReceiveDragProc(dragRef,itemID)); return ((controlPtr != NULL) && controlPtr->DataBrowserReceiveDragProc(dragRef,itemID));
} /* wxMacDataBrowserTableViewControl::DataBrowserReceiveDragProc(ControlRef, DragReference, DataBrowserItemID) */ } /* wxMacDataBrowserTableViewControl::DataBrowserReceiveDragProc(ControlRef, DragReference, DataBrowserItemID) */
@@ -325,9 +325,9 @@ wxMacDataBrowserTableViewControl::wxMacDataBrowserTableViewControl(wxWindow* pee
SetReferenceInNativeControl(); SetReferenceInNativeControl();
verify_noerr(err); verify_noerr(err);
::InstallControlEventHandler(this->m_controlRef, GetDataBrowserCtrlEventHandlerUPP(), GetEventTypeCount(eventList), eventList, peer, (EventHandlerRef *)&m_macDataViewCtrlEventHandler); ::InstallControlEventHandler(this->m_controlRef, GetDataBrowserCtrlEventHandlerUPP(), GetEventTypeCount(eventList), eventList, peer, (EventHandlerRef *)&m_macDataViewCtrlEventHandler);
// setup standard callbacks: // setup standard callbacks:
if (gDataBrowserTableViewGetContextualMenuUPP == NULL) gDataBrowserTableViewGetContextualMenuUPP = NewDataBrowserGetContextualMenuUPP(wxMacDataBrowserTableViewControl::DataBrowserGetContextualMenuProc); if (gDataBrowserTableViewGetContextualMenuUPP == NULL) gDataBrowserTableViewGetContextualMenuUPP = NewDataBrowserGetContextualMenuUPP(wxMacDataBrowserTableViewControl::DataBrowserGetContextualMenuProc);
if (gDataBrowserTableViewItemCompareUPP == NULL) gDataBrowserTableViewItemCompareUPP = NewDataBrowserItemCompareUPP (wxMacDataBrowserTableViewControl::DataBrowserCompareProc); if (gDataBrowserTableViewItemCompareUPP == NULL) gDataBrowserTableViewItemCompareUPP = NewDataBrowserItemCompareUPP (wxMacDataBrowserTableViewControl::DataBrowserCompareProc);
@@ -388,7 +388,7 @@ wxMacDataBrowserTableViewControl::wxMacDataBrowserTableViewControl(wxWindow* pee
} }
OptionBits attributes; // variable definition OptionBits attributes; // variable definition
if (this->GetAttributes(&attributes) == noErr) // get default settings if (this->GetAttributes(&attributes) == noErr) // get default settings
{ {
if ((style & wxDV_VERT_RULES) != 0) if ((style & wxDV_VERT_RULES) != 0)
@@ -591,7 +591,7 @@ OSStatus wxMacDataBrowserTableViewControl::IsUsedPropertyID(DataBrowserPropertyI
// lead to a large overhead for the call but returns an error code if the property id does not exist, here we use the function that returns // lead to a large overhead for the call but returns an error code if the property id does not exist, here we use the function that returns
// the column position for the property id: // the column position for the property id:
DataBrowserTableViewColumnIndex index; DataBrowserTableViewColumnIndex index;
return ::GetDataBrowserTableViewColumnPosition(this->m_controlRef,propertyID,&index); return ::GetDataBrowserTableViewColumnPosition(this->m_controlRef,propertyID,&index);
} /* wxMacDataBrowserTableViewControl::IsUsedPropertyId(DataBrowserPropertyID) const */ } /* wxMacDataBrowserTableViewControl::IsUsedPropertyId(DataBrowserPropertyID) const */
@@ -635,10 +635,10 @@ OSStatus wxMacDataBrowserTableViewControl::AddItems(DataBrowserItemID container,
OSStatus wxMacDataBrowserTableViewControl::GetFreeItemID(DataBrowserItemID* id) const OSStatus wxMacDataBrowserTableViewControl::GetFreeItemID(DataBrowserItemID* id) const
{ {
ItemCount noOfItems; ItemCount noOfItems;
OSStatus status; OSStatus status;
status = this->GetItemCount(&noOfItems); status = this->GetItemCount(&noOfItems);
wxCHECK_MSG(status == noErr,status,_("Could not retrieve number of items")); wxCHECK_MSG(status == noErr,status,_("Could not retrieve number of items"));
if (noOfItems == 0) if (noOfItems == 0)
@@ -693,7 +693,7 @@ OSStatus wxMacDataBrowserTableViewControl::IsUsedItemID(DataBrowserItemID itemID
// lead to a large overhead for the call but returns an error code if the property id does not exist, here we use the function that returns // lead to a large overhead for the call but returns an error code if the property id does not exist, here we use the function that returns
// the column position for the property id: // the column position for the property id:
DataBrowserTableViewColumnIndex index; DataBrowserTableViewColumnIndex index;
return ::GetDataBrowserTableViewItemRow(this->m_controlRef,itemID,&index); return ::GetDataBrowserTableViewItemRow(this->m_controlRef,itemID,&index);
} /* wxMacDataBrowserTableViewControl::IsUsedItemID(DataBrowserItemID) const */ } /* wxMacDataBrowserTableViewControl::IsUsedItemID(DataBrowserItemID) const */
@@ -720,7 +720,7 @@ size_t wxMacDataBrowserTableViewControl::GetSelectedItemIDs(wxArrayDataBrowserIt
{ {
DataBrowserItemID* itemIDPtr; DataBrowserItemID* itemIDPtr;
Handle handle(::NewHandle(0)); Handle handle(::NewHandle(0));
size_t noOfItems; size_t noOfItems;
@@ -839,8 +839,8 @@ wxMacDataViewDataBrowserListViewControl::wxMacDataViewDataBrowserListViewControl
bool wxMacDataViewDataBrowserListViewControl::ClearColumns(void) bool wxMacDataViewDataBrowserListViewControl::ClearColumns(void)
{ {
UInt32 noOfColumns; UInt32 noOfColumns;
wxCHECK_MSG(this->GetColumnCount(&noOfColumns) == noErr,false,_("Could not determine number of columns.")); wxCHECK_MSG(this->GetColumnCount(&noOfColumns) == noErr,false,_("Could not determine number of columns."));
for (UInt32 i=0; i<noOfColumns; ++i) for (UInt32 i=0; i<noOfColumns; ++i)
wxCHECK_MSG(this->RemoveColumnByIndex(0) == noErr,false,_("Could not remove column.")); wxCHECK_MSG(this->RemoveColumnByIndex(0) == noErr,false,_("Could not remove column."));
@@ -904,7 +904,7 @@ bool wxMacDataViewDataBrowserListViewControl::InsertColumn(unsigned int pos, wxD
if (noOfColumns == 1) if (noOfColumns == 1)
{ {
wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer())); wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer()));
wxCHECK_MSG(dataViewCtrlPtr != NULL,false,_("wxWidget's control not initialized.")); wxCHECK_MSG(dataViewCtrlPtr != NULL,false,_("wxWidget's control not initialized."));
dataViewCtrlPtr->AddChildren(wxDataViewItem()); dataViewCtrlPtr->AddChildren(wxDataViewItem());
return true; return true;
@@ -1189,7 +1189,10 @@ void wxMacDataViewDataBrowserListViewControl::Resort(void)
// //
// other methods (inherited from wxDataViewWidgetImpl) // other methods (inherited from wxDataViewWidgetImpl)
// //
void wxMacDataViewDataBrowserListViewControl::HitTest(wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const void
wxMacDataViewDataBrowserListViewControl::HitTest(const wxPoint& WXUNUSED(point),
wxDataViewItem& item,
wxDataViewColumn*& columnPtr) const
{ {
// not yet implemented: // not yet implemented:
item = wxDataViewItem(); item = wxDataViewItem();
@@ -1209,8 +1212,8 @@ void wxMacDataViewDataBrowserListViewControl::SetRowHeight(wxDataViewItem const&
void wxMacDataViewDataBrowserListViewControl::OnSize(void) void wxMacDataViewDataBrowserListViewControl::OnSize(void)
{ {
UInt32 noOfColumns; UInt32 noOfColumns;
this->GetColumnCount(&noOfColumns); this->GetColumnCount(&noOfColumns);
if (noOfColumns <= 1) // no horizontal scroll bar and the only column expands to the width of the whole control if (noOfColumns <= 1) // no horizontal scroll bar and the only column expands to the width of the whole control
{ {
@@ -1229,9 +1232,9 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserCompareProc(DataBrow
DataBrowserSortOrder sortOrder; DataBrowserSortOrder sortOrder;
DataBrowserTableViewColumnIndex modelColumnIndex; DataBrowserTableViewColumnIndex modelColumnIndex;
wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer())); wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer()));
wxCHECK_MSG(dataViewCtrlPtr != NULL, false,_("Pointer to data view control not set correctly.")); wxCHECK_MSG(dataViewCtrlPtr != NULL, false,_("Pointer to data view control not set correctly."));
wxCHECK_MSG(dataViewCtrlPtr->GetModel() != NULL,false,_("Pointer to model not set correctly.")); wxCHECK_MSG(dataViewCtrlPtr->GetModel() != NULL,false,_("Pointer to model not set correctly."));
@@ -1239,7 +1242,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserCompareProc(DataBrow
{ {
// variable definition and initialization: // variable definition and initialization:
wxDataViewColumn* ColumnPtr(this->GetColumnPtr(sortProperty)); wxDataViewColumn* ColumnPtr(this->GetColumnPtr(sortProperty));
wxCHECK_MSG(ColumnPtr != NULL,false,_("Could not determine column index.")); wxCHECK_MSG(ColumnPtr != NULL,false,_("Could not determine column index."));
modelColumnIndex = ColumnPtr->GetModelColumn(); modelColumnIndex = ColumnPtr->GetModelColumn();
} }
@@ -1282,7 +1285,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
{ {
// variable definitions: // variable definitions:
wxDataViewCtrl* dataViewCtrlPtr; wxDataViewCtrl* dataViewCtrlPtr;
dataViewCtrlPtr = dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer()); dataViewCtrlPtr = dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer());
wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly.")); wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly."));
if (dataViewCtrlPtr->IsDeleting()) if (dataViewCtrlPtr->IsDeleting())
@@ -1292,14 +1295,14 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
// variable definitions: // variable definitions:
OSStatus errorStatus; OSStatus errorStatus;
wxDataViewColumn* dataViewColumnPtr; wxDataViewColumn* dataViewColumnPtr;
wxCHECK_MSG(dataViewCtrlPtr->GetModel() != NULL,errDataBrowserNotConfigured,_("Pointer to model not set correctly.")); wxCHECK_MSG(dataViewCtrlPtr->GetModel() != NULL,errDataBrowserNotConfigured,_("Pointer to model not set correctly."));
dataViewColumnPtr = this->GetColumnPtr(propertyID); dataViewColumnPtr = this->GetColumnPtr(propertyID);
wxCHECK_MSG((dataViewColumnPtr != NULL) && (dataViewColumnPtr->GetRenderer() != NULL),errDataBrowserNotConfigured,_("There is no column or renderer for the specified column index.")); wxCHECK_MSG((dataViewColumnPtr != NULL) && (dataViewColumnPtr->GetRenderer() != NULL),errDataBrowserNotConfigured,_("There is no column or renderer for the specified column index."));
wxDataViewItem dvItem(reinterpret_cast<void*>(itemID)); wxDataViewItem dvItem(reinterpret_cast<void*>(itemID));
unsigned int col = dataViewColumnPtr->GetModelColumn(); unsigned int col = dataViewColumnPtr->GetModelColumn();
switch (dataViewColumnPtr->GetRenderer()->GetNativeData()->GetPropertyType()) switch (dataViewColumnPtr->GetRenderer()->GetNativeData()->GetPropertyType())
{ {
case kDataBrowserCheckboxType: case kDataBrowserCheckboxType:
@@ -1353,7 +1356,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
wxMacCFStringHolder modifiedString(stringReference); wxMacCFStringHolder modifiedString(stringReference);
#endif #endif
wxVariant modifiedData(modifiedString.AsString()); wxVariant modifiedData(modifiedString.AsString());
if (dataViewCtrlPtr->GetModel()->SetValue(modifiedData, dvItem, col) && if (dataViewCtrlPtr->GetModel()->SetValue(modifiedData, dvItem, col) &&
dataViewCtrlPtr->GetModel()->ValueChanged(dvItem, col)) dataViewCtrlPtr->GetModel()->ValueChanged(dvItem, col))
return noErr; return noErr;
@@ -1376,7 +1379,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
wxVariant variant; wxVariant variant;
wxDataViewColumn* dataViewColumnPtr; wxDataViewColumn* dataViewColumnPtr;
wxDataViewCtrl* dataViewCtrlPtr; wxDataViewCtrl* dataViewCtrlPtr;
dataViewCtrlPtr = dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer()); dataViewCtrlPtr = dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer());
wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly.")); wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly."));
wxCHECK_MSG(dataViewCtrlPtr->GetModel() != NULL,errDataBrowserNotConfigured,_("Pointer to model not set correctly.")); wxCHECK_MSG(dataViewCtrlPtr->GetModel() != NULL,errDataBrowserNotConfigured,_("Pointer to model not set correctly."));
@@ -1388,7 +1391,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
{ {
dataViewColumnPtr->GetRenderer()->GetNativeData()->SetItemDataRef(itemData); dataViewColumnPtr->GetRenderer()->GetNativeData()->SetItemDataRef(itemData);
dataViewColumnPtr->GetRenderer()->SetValue(variant); dataViewColumnPtr->GetRenderer()->SetValue(variant);
wxCHECK_MSG(dataViewColumnPtr->GetRenderer()->Render(),errDataBrowserNotConfigured,_("Rendering failed.")); wxCHECK_MSG(dataViewColumnPtr->GetRenderer()->MacRender(),errDataBrowserNotConfigured,_("Rendering failed."));
} }
return noErr; return noErr;
} }
@@ -1400,11 +1403,11 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
{ {
// variable definitions: // variable definitions:
wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer())); wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer()));
wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly.")); wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly."));
// initialize wxWidget event: // initialize wxWidget event:
wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,dataViewCtrlPtr->GetId()); // variable definition wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING,dataViewCtrlPtr->GetId()); // variable definition
dataViewEvent.SetEventObject(dataViewCtrlPtr); dataViewEvent.SetEventObject(dataViewCtrlPtr);
dataViewEvent.SetItem (wxDataViewItem(reinterpret_cast<void*>(itemID))); dataViewEvent.SetItem (wxDataViewItem(reinterpret_cast<void*>(itemID)));
dataViewEvent.SetModel (dataViewCtrlPtr->GetModel()); dataViewEvent.SetModel (dataViewCtrlPtr->GetModel());
@@ -1417,7 +1420,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
{ {
// variable definitions: // variable definitions:
wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer())); wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer()));
wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly.")); wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly."));
// initialize wxWidget event: // initialize wxWidget event:
wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,dataViewCtrlPtr->GetId()); // variable definition wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING,dataViewCtrlPtr->GetId()); // variable definition
@@ -1434,7 +1437,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(
{ {
// variable definition: // variable definition:
wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer())); wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer()));
wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly.")); wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly."));
wxCHECK_MSG(dataViewCtrlPtr->GetModel() != NULL,errDataBrowserNotConfigured,_("Pointer to model not set correctly.")); wxCHECK_MSG(dataViewCtrlPtr->GetModel() != NULL,errDataBrowserNotConfigured,_("Pointer to model not set correctly."));
return ::SetDataBrowserItemDataBooleanValue(itemData,dataViewCtrlPtr->GetModel()->IsContainer(wxDataViewItem(reinterpret_cast<void*>(itemID)))); return ::SetDataBrowserItemDataBooleanValue(itemData,dataViewCtrlPtr->GetModel()->IsContainer(wxDataViewItem(reinterpret_cast<void*>(itemID))));
@@ -1461,7 +1464,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
{ {
// initialize wxWidget event: // initialize wxWidget event:
wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,dataViewCtrlPtr->GetId()); // variable definition wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED,dataViewCtrlPtr->GetId()); // variable definition
dataViewEvent.SetEventObject(dataViewCtrlPtr); dataViewEvent.SetEventObject(dataViewCtrlPtr);
dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID))); dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID)));
// finally send the equivalent wxWidget event: // finally send the equivalent wxWidget event:
@@ -1473,7 +1476,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
{ {
// initialize wxWidget event: // initialize wxWidget event:
wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,dataViewCtrlPtr->GetId()); // variable definition wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED,dataViewCtrlPtr->GetId()); // variable definition
dataViewEvent.SetEventObject(dataViewCtrlPtr); dataViewEvent.SetEventObject(dataViewCtrlPtr);
dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID))); dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID)));
// finally send the equivalent wxWidget event: // finally send the equivalent wxWidget event:
@@ -1486,30 +1489,9 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
dataViewCtrlPtr->FinishCustomItemEditing(); // stop editing of a custom item first (if necessary) dataViewCtrlPtr->FinishCustomItemEditing(); // stop editing of a custom item first (if necessary)
{ {
// initialize wxWidget event: // initialize wxWidget event:
DataBrowserPropertyID propertyID; DataBrowserPropertyID propertyID;
wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED,dataViewCtrlPtr->GetId()); // variable definition wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED,dataViewCtrlPtr->GetId()); // variable definition
dataViewEvent.SetEventObject(dataViewCtrlPtr);
dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID)));
if (this->GetPropertyID(itemData,&propertyID) == noErr)
{
// variable definition and initialization:
DataBrowserTableViewColumnIndex columnIndex;
wxCHECK_RET(this->GetColumnIndex(propertyID,&columnIndex),_("Column index not found."));
dataViewEvent.SetColumn(columnIndex);
dataViewEvent.SetDataViewColumn(this->GetColumnPtr(propertyID));
}
// finally send the equivalent wxWidget event:
dataViewCtrlPtr->GetEventHandler()->ProcessEvent(dataViewEvent);
} /* block */
break;
case kDataBrowserEditStopped:
{
// initialize wxWidget event:
DataBrowserPropertyID propertyID;
wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE,dataViewCtrlPtr->GetId()); // variable definition
dataViewEvent.SetEventObject(dataViewCtrlPtr); dataViewEvent.SetEventObject(dataViewCtrlPtr);
dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID))); dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID)));
if (this->GetPropertyID(itemData,&propertyID) == noErr) if (this->GetPropertyID(itemData,&propertyID) == noErr)
@@ -1519,7 +1501,28 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
wxCHECK_RET(this->GetColumnIndex(propertyID,&columnIndex),_("Column index not found.")); wxCHECK_RET(this->GetColumnIndex(propertyID,&columnIndex),_("Column index not found."));
dataViewEvent.SetColumn(columnIndex); dataViewEvent.SetColumn(columnIndex);
dataViewEvent.SetDataViewColumn(this->GetColumnPtr(propertyID)); dataViewEvent.SetDataViewColumn(this->GetColumnPtr(propertyID));
}
// finally send the equivalent wxWidget event:
dataViewCtrlPtr->GetEventHandler()->ProcessEvent(dataViewEvent);
} /* block */
break;
case kDataBrowserEditStopped:
{
// initialize wxWidget event:
DataBrowserPropertyID propertyID;
wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE,dataViewCtrlPtr->GetId()); // variable definition
dataViewEvent.SetEventObject(dataViewCtrlPtr);
dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast<void*>(itemID)));
if (this->GetPropertyID(itemData,&propertyID) == noErr)
{
// variable definition and initialization:
DataBrowserTableViewColumnIndex columnIndex;
wxCHECK_RET(this->GetColumnIndex(propertyID,&columnIndex),_("Column index not found."));
dataViewEvent.SetColumn(columnIndex);
dataViewEvent.SetDataViewColumn(this->GetColumnPtr(propertyID));
} }
// finally send the equivalent wxWidget event: // finally send the equivalent wxWidget event:
dataViewCtrlPtr->GetEventHandler()->ProcessEvent(dataViewEvent); dataViewCtrlPtr->GetEventHandler()->ProcessEvent(dataViewEvent);
@@ -1571,7 +1574,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
wxDataViewColumn* const columnPtr = dataViewCtrlPtr->GetColumnPtr(i); wxDataViewColumn* const columnPtr = dataViewCtrlPtr->GetColumnPtr(i);
// variable definition: // variable definition:
UInt16 columnWidth; UInt16 columnWidth;
wxCHECK_RET(this->GetColumnWidth(columnPtr->GetNativeData()->GetPropertyID(),&columnWidth) == noErr,_("Column width could not be determined")); wxCHECK_RET(this->GetColumnWidth(columnPtr->GetNativeData()->GetPropertyID(),&columnWidth) == noErr,_("Column width could not be determined"));
columnPtr->SetWidthVariable(columnWidth); columnPtr->SetWidthVariable(columnWidth);
} }
@@ -1582,7 +1585,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
{ {
DataBrowserSortOrder sortOrder; DataBrowserSortOrder sortOrder;
DataBrowserTableViewColumnIndex columnIndex; DataBrowserTableViewColumnIndex columnIndex;
if ((this->GetSortOrder(&sortOrder) == noErr) && (this->GetColumnIndex(propertyID,&columnIndex) == noErr)) if ((this->GetSortOrder(&sortOrder) == noErr) && (this->GetColumnIndex(propertyID,&columnIndex) == noErr))
{ {
// variable definition and initialization: // variable definition and initialization:
@@ -1609,14 +1612,20 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da
} }
} /* wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(DataBrowserItemID, DataBrowserItemNotification, DataBrowserItemDataRef) */ } /* wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(DataBrowserItemID, DataBrowserItemNotification, DataBrowserItemDataRef) */
void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemState state, Rect const* rectangle, SInt16 bitDepth, Boolean colorDevice) void
wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID,
DataBrowserPropertyID propertyID,
DataBrowserItemState state,
Rect const* rectangle,
SInt16 WXUNUSED(bitDepth),
Boolean WXUNUSED(colorDevice))
{ {
DataBrowserTableViewColumnIndex columnIndex; DataBrowserTableViewColumnIndex columnIndex;
wxDataViewColumn* dataViewColumnPtr; wxDataViewColumn* dataViewColumnPtr;
wxDataViewCtrl* dataViewCtrlPtr; wxDataViewCtrl* dataViewCtrlPtr;
wxDataViewCustomRenderer* dataViewCustomRendererPtr; wxDataViewCustomRenderer* dataViewCustomRendererPtr;
wxVariant dataToRender; wxVariant dataToRender;
@@ -1659,33 +1668,33 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowse
content.right -= wxSystemSettings::GetMetric(wxSYS_VSCROLL_X); content.right -= wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
wxDC *dc = dataViewCustomRendererPtr->GetDC(); wxDC *dc = dataViewCustomRendererPtr->GetDC();
int active_border_fudge = 0; int active_border_fudge = 0;
if (dataViewCtrlPtr->HasFocus() && !dataViewCtrlPtr->HasFlag( wxBORDER_NONE )) if (dataViewCtrlPtr->HasFocus() && !dataViewCtrlPtr->HasFlag( wxBORDER_NONE ))
active_border_fudge = 1; active_border_fudge = 1;
else else
active_border_fudge = -2; active_border_fudge = -2;
wxRect cellrect( static_cast<int>(rectangle->left + active_border_fudge), wxRect cellrect( static_cast<int>(rectangle->left + active_border_fudge),
static_cast<int>(rectangle->top + active_border_fudge), static_cast<int>(rectangle->top + active_border_fudge),
static_cast<int>(1+rectangle->right-rectangle->left), static_cast<int>(1+rectangle->right-rectangle->left),
static_cast<int>(rectangle->bottom-rectangle->top) ); static_cast<int>(rectangle->bottom-rectangle->top) );
bool is_active = IsControlActive( this->m_controlRef ); bool is_active = IsControlActive( this->m_controlRef );
if (state == kDataBrowserItemIsSelected) if (state == kDataBrowserItemIsSelected)
{ {
wxColour col( wxMacCreateCGColorFromHITheme( (is_active) ? wxColour col( wxMacCreateCGColorFromHITheme( (is_active) ?
kThemeBrushAlternatePrimaryHighlightColor kThemeBrushAlternatePrimaryHighlightColor
: kThemeBrushSecondaryHighlightColor ) ); : kThemeBrushSecondaryHighlightColor ) );
wxRect rect = cellrect; wxRect rect = cellrect;
Rect itemrect; Rect itemrect;
GetDataBrowserItemPartBounds( this->m_controlRef, itemID, propertyID, GetDataBrowserItemPartBounds( this->m_controlRef, itemID, propertyID,
kDataBrowserPropertyEnclosingPart, &itemrect ); kDataBrowserPropertyEnclosingPart, &itemrect );
rect.x = itemrect.left-2; rect.x = itemrect.left-2;
rect.width = itemrect.right-itemrect.left+3; rect.width = itemrect.right-itemrect.left+3;
wxBrush selBrush( col ); wxBrush selBrush( col );
wxPen oldpen( dc->GetPen() ); wxPen oldpen( dc->GetPen() );
wxBrush oldbrush( dc->GetBrush() ); wxBrush oldbrush( dc->GetBrush() );
@@ -1698,18 +1707,24 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowse
wxDataViewModel *model = dataViewCtrlPtr->GetModel(); wxDataViewModel *model = dataViewCtrlPtr->GetModel();
if ((columnIndex == 0) || !model->IsContainer(dataItem) || model->HasContainerColumns(dataItem)) if ((columnIndex == 0) || !model->IsContainer(dataItem) || model->HasContainerColumns(dataItem))
{ {
// make sure that 'Render' can draw only in the allowed area: // make sure that 'Render' can draw only in the allowed area:
dc->SetClippingRegion(content.left,content.top,content.right-content.left+1,content.bottom-content.top+1); dc->SetClippingRegion(content.left,content.top,content.right-content.left+1,content.bottom-content.top+1);
(void) (dataViewCustomRendererPtr->Render( cellrect, dc, (void) (dataViewCustomRendererPtr->Render( cellrect, dc,
((state == kDataBrowserItemIsSelected) ? wxDATAVIEW_CELL_SELECTED : 0))); ((state == kDataBrowserItemIsSelected) ? wxDATAVIEW_CELL_SELECTED : 0)));
dc->DestroyClippingRegion(); // probably not necessary dc->DestroyClippingRegion(); // probably not necessary
} }
dataViewCustomRendererPtr->SetDC(NULL); dataViewCustomRendererPtr->SetDC(NULL);
} /* wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID, DataBrowserPropertyID, DataBrowserItemState, Rect const*, SInt16, Boolean) */ } /* wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID, DataBrowserPropertyID, DataBrowserItemState, Rect const*, SInt16, Boolean) */
Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, CFStringRef theString, Rect* maxEditTextRect, Boolean* shrinkToFit) Boolean
wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(
DataBrowserItemID WXUNUSED(itemID),
DataBrowserPropertyID WXUNUSED(propertyID),
CFStringRef WXUNUSED(theString),
Rect* WXUNUSED(maxEditTextRect),
Boolean* WXUNUSED(shrinkToFit))
{ {
return false; return false;
} /* wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID, DataBrowserPropertyID, CFStringRef, Rect*, Boolean*) */ } /* wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID, DataBrowserPropertyID, CFStringRef, Rect*, Boolean*) */
@@ -1724,9 +1739,9 @@ DataBrowserTrackingResult wxMacDataViewDataBrowserListViewControl::DataBrowserTr
wxDataViewColumn* dataViewColumnPtr; wxDataViewColumn* dataViewColumnPtr;
wxDataViewCtrl* dataViewCtrlPtr; wxDataViewCtrl* dataViewCtrlPtr;
wxDataViewCustomRenderer* dataViewCustomRendererPtr; wxDataViewCustomRenderer* dataViewCustomRendererPtr;
wxDataViewItem dataViewCustomRendererItem; wxDataViewItem dataViewCustomRendererItem;
@@ -1754,7 +1769,7 @@ DataBrowserTrackingResult wxMacDataViewDataBrowserListViewControl::DataBrowserTr
{ {
// variable definition: // variable definition:
wxRect wxRectangle; wxRect wxRectangle;
::wxMacNativeToRect(theRect,&wxRectangle); ::wxMacNativeToRect(theRect,&wxRectangle);
dataViewCustomRendererPtr->StartEditing(dataViewCustomRendererItem,wxRectangle); dataViewCustomRendererPtr->StartEditing(dataViewCustomRendererItem,wxRectangle);
dataViewCtrlPtr->SetCustomRendererItem(dataViewCustomRendererItem); dataViewCtrlPtr->SetCustomRendererItem(dataViewCustomRendererItem);
@@ -1784,7 +1799,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAcceptDragProc(DragR
ItemReference itemRef; ItemReference itemRef;
wxDataObjectComposite* dataObjects; wxDataObjectComposite* dataObjects;
wxMemoryBuffer buffer; wxMemoryBuffer buffer;
::GetDragItemReferenceNumber(dragRef,indexDraggedItem,&itemRef); // the index begins with 1! ::GetDragItemReferenceNumber(dragRef,indexDraggedItem,&itemRef); // the index begins with 1!
dataObjects = this->GetDnDDataObjects(dragRef,itemRef); dataObjects = this->GetDnDDataObjects(dragRef,itemRef);
// create wxWidget's event: // create wxWidget's event:
@@ -1818,7 +1833,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAddDragItemProc(Drag
Boolean addDragItem; Boolean addDragItem;
wxDataViewCtrl* dataViewCtrlPtr; wxDataViewCtrl* dataViewCtrlPtr;
wxDataViewItem dataViewItem; wxDataViewItem dataViewItem;
@@ -1838,7 +1853,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAddDragItemProc(Drag
// the object a wxDataObjectComposite object is used; // the object a wxDataObjectComposite object is used;
// currently, the composite object only contains a TAB concatenated string of all data: // currently, the composite object only contains a TAB concatenated string of all data:
wxDataObjectComposite* dataObject(new wxDataObjectComposite()); wxDataObjectComposite* dataObject(new wxDataObjectComposite());
dataObject->Add(new wxTextDataObject(::ConcatenateDataViewItemValues(dataViewCtrlPtr,dataViewItem))); dataObject->Add(new wxTextDataObject(::ConcatenateDataViewItemValues(dataViewCtrlPtr,dataViewItem)));
dataViewEvent.SetDataObject(dataObject); dataViewEvent.SetDataObject(dataObject);
// check if event has not been vetoed: // check if event has not been vetoed:
@@ -1858,12 +1873,12 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAddDragItemProc(Drag
{ {
// constant definition for abbreviational purposes: // constant definition for abbreviational purposes:
size_t const noOfFormats = dataViewEvent.GetDataObject()->GetFormatCount(); size_t const noOfFormats = dataViewEvent.GetDataObject()->GetFormatCount();
if (noOfFormats > 0) if (noOfFormats > 0)
{ {
// variable definition: // variable definition:
wxDataFormat* dataFormats; wxDataFormat* dataFormats;
dataFormats = new wxDataFormat[noOfFormats]; dataFormats = new wxDataFormat[noOfFormats];
dataViewEvent.GetDataObject()->GetAllFormats(dataFormats,wxDataObject::Get); dataViewEvent.GetDataObject()->GetAllFormats(dataFormats,wxDataObject::Get);
for (size_t i=0; i<noOfFormats; ++i) for (size_t i=0; i<noOfFormats; ++i)
@@ -1878,7 +1893,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAddDragItemProc(Drag
size_t const dataSize = dataViewEvent.GetDataObject()->GetDataSize(wxDF_TEXT); size_t const dataSize = dataViewEvent.GetDataObject()->GetDataSize(wxDF_TEXT);
// variable definition and initialization: // variable definition and initialization:
wxMemoryBuffer dataObject(dataSize); wxMemoryBuffer dataObject(dataSize);
dataViewEvent.GetDataObject()->GetDataHere(wxDF_TEXT,dataObject.GetWriteBuf(dataSize)); dataViewEvent.GetDataObject()->GetDataHere(wxDF_TEXT,dataObject.GetWriteBuf(dataSize));
dataObject.UngetWriteBuf(dataSize); dataObject.UngetWriteBuf(dataSize);
if (::AddDragItemFlavor(dragRef,*itemRef,'TEXT',dataObject.GetData(),dataSize,0) != noErr) if (::AddDragItemFlavor(dragRef,*itemRef,'TEXT',dataObject.GetData(),dataSize,0) != noErr)
@@ -1891,14 +1906,14 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAddDragItemProc(Drag
size_t const dataSize = dataViewEvent.GetDataObject()->GetDataSize(wxDF_TEXT); size_t const dataSize = dataViewEvent.GetDataObject()->GetDataSize(wxDF_TEXT);
// as there is no direct access to the data copy it to a memory buffer: // as there is no direct access to the data copy it to a memory buffer:
wxMemoryBuffer dataObject(dataSize); wxMemoryBuffer dataObject(dataSize);
dataViewEvent.GetDataObject()->GetDataHere(wxDF_TEXT,dataObject.GetWriteBuf(dataSize)); dataViewEvent.GetDataObject()->GetDataHere(wxDF_TEXT,dataObject.GetWriteBuf(dataSize));
dataObject.UngetWriteBuf(dataSize); dataObject.UngetWriteBuf(dataSize);
// if the data is stored in unicode format the internal representation is utf-8 (not mentioned in the documentation but in the source code); // if the data is stored in unicode format the internal representation is utf-8 (not mentioned in the documentation but in the source code);
// DnD uses fixed utf-16 representation -> use the OSX functions for a conversion: // DnD uses fixed utf-16 representation -> use the OSX functions for a conversion:
CFDataRef osxData (::CFDataCreateWithBytesNoCopy(kCFAllocatorDefault,reinterpret_cast<UInt8*>(dataObject.GetData()),dataSize,kCFAllocatorNull)); CFDataRef osxData (::CFDataCreateWithBytesNoCopy(kCFAllocatorDefault,reinterpret_cast<UInt8*>(dataObject.GetData()),dataSize,kCFAllocatorNull));
CFStringRef osxString(::CFStringCreateFromExternalRepresentation(kCFAllocatorDefault,osxData,kCFStringEncodingUTF8)); CFStringRef osxString(::CFStringCreateFromExternalRepresentation(kCFAllocatorDefault,osxData,kCFStringEncodingUTF8));
// the osxString contains now the data and therefore the previously occupied memory can be released and re-used: // the osxString contains now the data and therefore the previously occupied memory can be released and re-used:
::CFRelease(osxData); ::CFRelease(osxData);
osxData = ::CFStringCreateExternalRepresentation(kCFAllocatorDefault,osxString,kCFStringEncodingUTF16,32); osxData = ::CFStringCreateExternalRepresentation(kCFAllocatorDefault,osxString,kCFStringEncodingUTF16,32);
@@ -1957,7 +1972,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserReceiveDragProc(Drag
ItemReference itemRef; ItemReference itemRef;
wxDataObjectComposite* dataObjects; wxDataObjectComposite* dataObjects;
wxMemoryBuffer buffer; wxMemoryBuffer buffer;
// collect native information: // collect native information:
::GetDragItemReferenceNumber(dragRef,indexDraggedItem,&itemRef); // the index begins with 1! ::GetDragItemReferenceNumber(dragRef,indexDraggedItem,&itemRef); // the index begins with 1!
dataObjects = this->GetDnDDataObjects(dragRef,itemRef); dataObjects = this->GetDnDDataObjects(dragRef,itemRef);
@@ -2003,7 +2018,7 @@ wxDataFormat wxMacDataViewDataBrowserListViewControl::GetDnDDataFormat(wxDataObj
size_t indexFormat; size_t indexFormat;
wxDataFormat* formats; wxDataFormat* formats;
// get all formats and check afterwards if the formats are compatible; if they are compatible the preferred format is returned otherwise // get all formats and check afterwards if the formats are compatible; if they are compatible the preferred format is returned otherwise
// wxDF_INVALID is returned; // wxDF_INVALID is returned;
// currently compatible types (ordered by priority are): // currently compatible types (ordered by priority are):
@@ -2066,7 +2081,7 @@ wxDataObjectComposite* wxMacDataViewDataBrowserListViewControl::GetDnDDataObject
{ {
// variable definition: // variable definition:
FlavorType flavorDataObject; FlavorType flavorDataObject;
if (::GetFlavorType(dragRef,itemRef,indexFlavor,&flavorDataObject) == noErr) // GetFlavorType uses a 1 based index! if (::GetFlavorType(dragRef,itemRef,indexFlavor,&flavorDataObject) == noErr) // GetFlavorType uses a 1 based index!
switch (flavorDataObject) switch (flavorDataObject)
{ {
@@ -2076,7 +2091,7 @@ wxDataObjectComposite* wxMacDataViewDataBrowserListViewControl::GetDnDDataObject
// variable definitions: // variable definitions:
Size nativeDataSize; Size nativeDataSize;
wxMemoryBuffer nativeData; wxMemoryBuffer nativeData;
if ((::GetFlavorDataSize(dragRef,itemRef,'TEXT',&nativeDataSize) == noErr) && if ((::GetFlavorDataSize(dragRef,itemRef,'TEXT',&nativeDataSize) == noErr) &&
(::GetFlavorData(dragRef,itemRef,'TEXT',nativeData.GetWriteBuf(nativeDataSize),&nativeDataSize,0) == noErr)) (::GetFlavorData(dragRef,itemRef,'TEXT',nativeData.GetWriteBuf(nativeDataSize),&nativeDataSize,0) == noErr))
{ {
@@ -2096,11 +2111,11 @@ wxDataObjectComposite* wxMacDataViewDataBrowserListViewControl::GetDnDDataObject
{ {
// variable definition: // variable definition:
Size nativeDataSize; Size nativeDataSize;
if (::GetFlavorDataSize(dragRef,itemRef,'utxt',&nativeDataSize) == noErr) if (::GetFlavorDataSize(dragRef,itemRef,'utxt',&nativeDataSize) == noErr)
{ {
CFMutableDataRef draggedData; CFMutableDataRef draggedData;
draggedData = ::CFDataCreateMutable(kCFAllocatorDefault,nativeDataSize); draggedData = ::CFDataCreateMutable(kCFAllocatorDefault,nativeDataSize);
::CFDataSetLength(draggedData,nativeDataSize); ::CFDataSetLength(draggedData,nativeDataSize);
if (::GetFlavorData(dragRef,itemRef,'utxt',::CFDataGetMutableBytePtr(draggedData),&nativeDataSize,0) == noErr) if (::GetFlavorData(dragRef,itemRef,'utxt',::CFDataGetMutableBytePtr(draggedData),&nativeDataSize,0) == noErr)
@@ -2108,7 +2123,7 @@ wxDataObjectComposite* wxMacDataViewDataBrowserListViewControl::GetDnDDataObject
// convert internally used UTF-16 representation to a UTF-8 representation: // convert internally used UTF-16 representation to a UTF-8 representation:
CFDataRef osxData; CFDataRef osxData;
CFStringRef osxString; CFStringRef osxString;
osxString = ::CFStringCreateFromExternalRepresentation(kCFAllocatorDefault,draggedData,kCFStringEncodingUTF16); // BOM character is handled by this function automatically osxString = ::CFStringCreateFromExternalRepresentation(kCFAllocatorDefault,draggedData,kCFStringEncodingUTF16); // BOM character is handled by this function automatically
osxData = ::CFStringCreateExternalRepresentation(kCFAllocatorDefault,osxString,kCFStringEncodingUTF8,32); osxData = ::CFStringCreateExternalRepresentation(kCFAllocatorDefault,osxString,kCFStringEncodingUTF8,32);
if (textDataObject == NULL) if (textDataObject == NULL)
@@ -2147,11 +2162,11 @@ wxDataObjectComposite* wxMacDataViewDataBrowserListViewControl::GetDnDDataObject
wxDataViewColumn* wxMacDataViewDataBrowserListViewControl::GetColumnPtr(DataBrowserPropertyID propertyID) const wxDataViewColumn* wxMacDataViewDataBrowserListViewControl::GetColumnPtr(DataBrowserPropertyID propertyID) const
{ {
wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer())); wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast<wxDataViewCtrl*>(this->GetWXPeer()));
if (dataViewCtrlPtr != NULL) if (dataViewCtrlPtr != NULL)
{ {
size_t const noOfColumns = dataViewCtrlPtr->GetColumnCount(); size_t const noOfColumns = dataViewCtrlPtr->GetColumnCount();
for (size_t i=0; i<noOfColumns; ++i) for (size_t i=0; i<noOfColumns; ++i)
if (dataViewCtrlPtr->GetColumnPtr(i)->GetNativeData()->GetPropertyID() == propertyID) if (dataViewCtrlPtr->GetColumnPtr(i)->GetNativeData()->GetPropertyID() == propertyID)
return dataViewCtrlPtr->GetColumnPtr(i); return dataViewCtrlPtr->GetColumnPtr(i);
@@ -2225,7 +2240,7 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const& varianttype,
this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserCustomType)); this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserCustomType));
} }
bool wxDataViewCustomRenderer::Render() bool wxDataViewCustomRenderer::MacRender()
{ {
return true; return true;
} }
@@ -2241,7 +2256,7 @@ wxDataViewTextRenderer::wxDataViewTextRenderer(wxString const& varianttype, wxDa
this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserTextType)); this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserTextType));
} }
bool wxDataViewTextRenderer::Render() bool wxDataViewTextRenderer::MacRender()
{ {
wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Text renderer cannot render value; value type: ")) << this->GetValue().GetType()); wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Text renderer cannot render value; value type: ")) << this->GetValue().GetType());
@@ -2260,7 +2275,7 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer(wxString const& varianttype,
this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserIconType)); this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserIconType));
} }
bool wxDataViewBitmapRenderer::Render() bool wxDataViewBitmapRenderer::MacRender()
// This method returns 'true' if // This method returns 'true' if
// - the passed bitmap is valid and it could be assigned to the native data browser; // - the passed bitmap is valid and it could be assigned to the native data browser;
// - the passed bitmap is invalid (or is not initialized); this case simulates a non-existing bitmap. // - the passed bitmap is invalid (or is not initialized); this case simulates a non-existing bitmap.
@@ -2279,13 +2294,16 @@ IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer)
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewIconTextRenderer // wxDataViewIconTextRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align) wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(
const wxString& varianttype,
wxDataViewCellMode mode,
int WXUNUSED(align))
:wxDataViewRenderer(varianttype,mode) :wxDataViewRenderer(varianttype,mode)
{ {
this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserIconAndTextType)); this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserIconAndTextType));
} }
bool wxDataViewIconTextRenderer::Render() bool wxDataViewIconTextRenderer::MacRender()
{ {
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());
@@ -2307,13 +2325,16 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer)
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewToggleRenderer // wxDataViewToggleRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align) wxDataViewToggleRenderer::wxDataViewToggleRenderer(
const wxString& varianttype,
wxDataViewCellMode mode,
int WXUNUSED(align))
:wxDataViewRenderer(varianttype,mode) :wxDataViewRenderer(varianttype,mode)
{ {
this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserCheckboxType)); this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserCheckboxType));
} }
bool wxDataViewToggleRenderer::Render() bool wxDataViewToggleRenderer::MacRender()
{ {
wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Toggle renderer cannot render value; value type: ")) << this->GetValue().GetType()); wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Toggle renderer cannot render value; value type: ")) << this->GetValue().GetType());
return (::SetDataBrowserItemDataButtonValue(this->GetNativeData()->GetItemDataRef(),this->GetValue().GetBool()) == noErr); return (::SetDataBrowserItemDataButtonValue(this->GetNativeData()->GetItemDataRef(),this->GetValue().GetBool()) == noErr);
@@ -2324,13 +2345,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer)
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewProgressRenderer // wxDataViewProgressRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& label, wxString const& varianttype, wxDataViewCellMode mode, int align) wxDataViewProgressRenderer::wxDataViewProgressRenderer(
const wxString& WXUNUSED(label),
wxString const& varianttype,
wxDataViewCellMode mode,
int align)
:wxDataViewRenderer(varianttype,mode,align) :wxDataViewRenderer(varianttype,mode,align)
{ {
this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserProgressBarType)); this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserProgressBarType));
} }
bool wxDataViewProgressRenderer::Render() bool wxDataViewProgressRenderer::MacRender()
{ {
wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Progress renderer cannot render value type; value type: ")) << this->GetValue().GetType()); wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Progress renderer cannot render value type; value type: ")) << this->GetValue().GetType());
return ((::SetDataBrowserItemDataMinimum(this->GetNativeData()->GetItemDataRef(), 0) == noErr) && return ((::SetDataBrowserItemDataMinimum(this->GetNativeData()->GetItemDataRef(), 0) == noErr) &&
@@ -2349,7 +2374,7 @@ wxDataViewDateRenderer::wxDataViewDateRenderer(wxString const& varianttype, wxDa
this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserDateTimeType)); this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserDateTimeType));
} }
bool wxDataViewDateRenderer::Render() bool wxDataViewDateRenderer::MacRender()
{ {
wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Date renderer cannot render value; value type: ")) << this->GetValue().GetType()); wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Date renderer cannot render value; value type: ")) << this->GetValue().GetType());
return (::SetDataBrowserItemDataDateTime(this->GetNativeData()->GetItemDataRef(),this->GetValue().GetDateTime().Subtract(wxDateTime(1,wxDateTime::Jan,1904)).GetSeconds().GetLo()) == noErr); return (::SetDataBrowserItemDataDateTime(this->GetNativeData()->GetItemDataRef(),this->GetValue().GetDateTime().Subtract(wxDateTime(1,wxDateTime::Jan,1904)).GetSeconds().GetLo()) == noErr);

5
src/osx/carbon/mediactrl.cpp
View File

@@ -86,6 +86,11 @@ public:
virtual bool Load(const wxString& fileName); virtual bool Load(const wxString& fileName);
virtual bool Load(const wxURI& location); virtual bool Load(const wxURI& location);
virtual bool Load(const wxURI& location,
const wxURI& WXUNUSED(proxy))
{
return Load(location);
}
virtual bool Play(); virtual bool Play();
virtual bool Pause(); virtual bool Pause();

8
src/osx/carbon/nonownedwnd.cpp
View File

@@ -1646,9 +1646,9 @@ void wxNonOwnedWindowCarbonImpl::ScreenToWindow( int *x, int *y )
HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowContentID , &contentView) ; HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowContentID , &contentView) ;
HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView ); HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
if ( x ) if ( x )
*x = p.x; *x = (int)p.x;
if ( y ) if ( y )
*y = p.y; *y = (int)p.y;
} }
void wxNonOwnedWindowCarbonImpl::WindowToScreen( int *x, int *y ) void wxNonOwnedWindowCarbonImpl::WindowToScreen( int *x, int *y )
@@ -1659,9 +1659,9 @@ void wxNonOwnedWindowCarbonImpl::WindowToScreen( int *x, int *y )
HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowContentID , &contentView) ; HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowContentID , &contentView) ;
HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL ); HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
if ( x ) if ( x )
*x = p.x; *x = (int)p.x;
if ( y ) if ( y )
*y = p.y; *y = (int)p.y;
} }
wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size, wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,

39
src/osx/carbon/window.cpp
View File

@@ -224,7 +224,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
if ( !thisWindow->MacDoRedraw( cEvent.GetTicks() ) ) if ( !thisWindow->MacDoRedraw( cEvent.GetTicks() ) )
{ {
// for native controls: call their native paint method // for native controls: call their native paint method
if ( !thisWindow->MacIsUserPane() || if ( !thisWindow->MacIsUserPane() ||
( thisWindow->IsTopLevel() && thisWindow->GetBackgroundStyle() == wxBG_STYLE_SYSTEM ) ) ( thisWindow->IsTopLevel() && thisWindow->GetBackgroundStyle() == wxBG_STYLE_SYSTEM ) )
{ {
if ( thisWindow->GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT ) if ( thisWindow->GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )
@@ -234,7 +234,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
} }
} }
} }
else else
{ {
result = noErr ; result = noErr ;
} }
@@ -310,7 +310,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
#endif #endif
wxLogTrace(_T("Focus"), _T("focus lost(%p)"), static_cast<void*>(thisWindow)); wxLogTrace(_T("Focus"), _T("focus lost(%p)"), static_cast<void*>(thisWindow));
// remove this as soon as posting the synthesized event works properly // remove this as soon as posting the synthesized event works properly
static bool inKillFocusEvent = false ; static bool inKillFocusEvent = false ;
@@ -364,7 +364,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
formerFocusWindow = thisWindow; formerFocusWindow = thisWindow;
wxLogTrace(_T("Focus"), _T("focus to be lost(%p)"), static_cast<void*>(thisWindow)); wxLogTrace(_T("Focus"), _T("focus to be lost(%p)"), static_cast<void*>(thisWindow));
} }
ControlPartCode previousControlPart = 0; ControlPartCode previousControlPart = 0;
verify_noerr( HIViewGetFocusPart(controlRef, &previousControlPart)); verify_noerr( HIViewGetFocusPart(controlRef, &previousControlPart));
@@ -397,7 +397,7 @@ static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handl
iEvent.SetParameter<EventTargetRef>( kEventParamPostTarget, typeEventTargetRef, GetControlEventTarget( controlRef ) ); iEvent.SetParameter<EventTargetRef>( kEventParamPostTarget, typeEventTargetRef, GetControlEventTarget( controlRef ) );
iEvent.SetParameter<ControlPartCode>( kEventParamControlPreviousPart, typeControlPartCode, previousControlPart ); iEvent.SetParameter<ControlPartCode>( kEventParamControlPreviousPart, typeControlPartCode, previousControlPart );
iEvent.SetParameter<ControlPartCode>( kEventParamControlCurrentPart, typeControlPartCode, currentControlPart ); iEvent.SetParameter<ControlPartCode>( kEventParamControlCurrentPart, typeControlPartCode, currentControlPart );
#if 1 #if 1
// TODO test this first, avoid double posts etc... // TODO test this first, avoid double posts etc...
PostEventToQueue( GetMainEventQueue(), evRef , kEventPriorityHigh ); PostEventToQueue( GetMainEventQueue(), evRef , kEventPriorityHigh );
@@ -792,7 +792,7 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p
{ {
wxWindow* wx = wxFindWindowFromWXWidget( (WXWidget) control ) ; wxWindow* wx = wxFindWindowFromWXWidget( (WXWidget) control ) ;
if ( wx ) if ( wx )
{ {
wxEventType scrollEvent = wxEVT_NULL; wxEventType scrollEvent = wxEVT_NULL;
switch ( partCode ) switch ( partCode )
{ {
@@ -825,12 +825,12 @@ pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode p
} }
wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ; wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;
wxWidgetImplType* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWidgetImplType* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer,
wxWindowMac* WXUNUSED(parent), wxWindowMac* WXUNUSED(parent),
wxWindowID WXUNUSED(id), wxWindowID WXUNUSED(id),
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long WXUNUSED(style), long WXUNUSED(style),
long WXUNUSED(extraStyle)) long WXUNUSED(extraStyle))
{ {
OSStatus err = noErr; OSStatus err = noErr;
@@ -925,7 +925,7 @@ void wxMacControl::Raise()
{ {
verify_noerr( HIViewSetZOrder( m_controlRef, kHIViewZOrderAbove, NULL ) ); verify_noerr( HIViewSetZOrder( m_controlRef, kHIViewZOrderAbove, NULL ) );
} }
void wxMacControl::Lower() void wxMacControl::Lower()
{ {
verify_noerr( HIViewSetZOrder( m_controlRef, kHIViewZOrderBelow, NULL ) ); verify_noerr( HIViewSetZOrder( m_controlRef, kHIViewZOrderBelow, NULL ) );
@@ -934,13 +934,16 @@ void wxMacControl::Lower()
void wxMacControl::GetContentArea(int &left , int &top , int &width , int &height) const void wxMacControl::GetContentArea(int &left , int &top , int &width , int &height) const
{ {
HIShapeRef rgn = NULL; HIShapeRef rgn = NULL;
Rect content ; Rect content ;
if ( HIViewCopyShape(m_controlRef, kHIViewContentMetaPart, &rgn) == noErr) if ( HIViewCopyShape(m_controlRef, kHIViewContentMetaPart, &rgn) == noErr)
{ {
CGRect cgrect; CGRect cgrect;
HIShapeGetBounds(rgn, &cgrect); HIShapeGetBounds(rgn, &cgrect);
content = (Rect){ cgrect.origin.y, cgrect.origin.x, cgrect.origin.y+cgrect.size.height, cgrect.origin.x+cgrect.size.width }; content = (Rect){ (short)cgrect.origin.y,
(short)cgrect.origin.x,
(short)(cgrect.origin.y+cgrect.size.height),
(short)(cgrect.origin.x+cgrect.size.width) };
CFRelease(rgn); CFRelease(rgn);
} }
else else
@@ -981,7 +984,7 @@ void wxMacControl::GetSize( int &width, int &height ) const
height = r.bottom - r.top; height = r.bottom - r.top;
} }
void wxMacControl::SetControlSize( wxWindowVariant variant ) void wxMacControl::SetControlSize( wxWindowVariant variant )
{ {
ControlSize size ; ControlSize size ;
switch ( variant ) switch ( variant )
@@ -1087,7 +1090,7 @@ bool wxMacControl::SetFocus()
if ( err == errCouldntSetFocus ) if ( err == errCouldntSetFocus )
return false ; return false ;
SetUserFocusWindow(GetControlOwner( m_controlRef ) ); SetUserFocusWindow(GetControlOwner( m_controlRef ) );
return true; return true;
} }
@@ -1487,11 +1490,11 @@ OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )
// Control Factory // Control Factory
wxWidgetImplType* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now ) wxWidgetImplType* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
{ {
// There is a bug in 10.2.X for ::GetRootControl returning the window view instead of // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of
// the content view, so we have to retrieve it explicitly // the content view, so we have to retrieve it explicitly
wxMacControl* contentview = new wxMacControl(now , true /*isRootControl*/); wxMacControl* contentview = new wxMacControl(now , true /*isRootControl*/);
HIViewFindByID( HIViewGetRoot( (WindowRef) now->GetWXWindow() ) , kHIViewWindowContentID , HIViewFindByID( HIViewGetRoot( (WindowRef) now->GetWXWindow() ) , kHIViewWindowContentID ,
contentview->GetControlRefAddr() ) ; contentview->GetControlRefAddr() ) ;

18
src/osx/cocoa/dataview.mm
View File

@@ -1513,7 +1513,7 @@ wxWidgetImplType* CreateDataView(wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(pare
dataViewColumnPtr->GetRenderer()->GetNativeData()->SetColumnPtr(tableColumn); dataViewColumnPtr->GetRenderer()->GetNativeData()->SetColumnPtr(tableColumn);
dataViewColumnPtr->GetRenderer()->GetNativeData()->SetItem(item); dataViewColumnPtr->GetRenderer()->GetNativeData()->SetItem(item);
dataViewColumnPtr->GetRenderer()->GetNativeData()->SetItemCell(cell); dataViewColumnPtr->GetRenderer()->GetNativeData()->SetItemCell(cell);
(void) dataViewColumnPtr->GetRenderer()->Render(); (void) dataViewColumnPtr->GetRenderer()->MacRender();
} }
// //
@@ -2106,7 +2106,7 @@ wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const& varianttype,
this->SetNativeData(new wxDataViewRendererNativeData([[wxCustomCell alloc] init])); this->SetNativeData(new wxDataViewRendererNativeData([[wxCustomCell alloc] init]));
} }
bool wxDataViewCustomRenderer::Render() bool wxDataViewCustomRenderer::MacRender()
{ {
[this->GetNativeData()->GetItemCell() setObjectValue:[[[wxCustomRendererObject alloc] initWithRenderer:this [this->GetNativeData()->GetItemCell() setObjectValue:[[[wxCustomRendererObject alloc] initWithRenderer:this
item:this->GetNativeData()->GetItem() item:this->GetNativeData()->GetItem()
@@ -2132,7 +2132,7 @@ wxDataViewTextRenderer::wxDataViewTextRenderer(wxString const& varianttype, wxDa
[cell release]; [cell release];
} }
bool wxDataViewTextRenderer::Render() bool wxDataViewTextRenderer::MacRender()
{ {
if (this->GetValue().GetType() == this->GetVariantType()) if (this->GetValue().GetType() == this->GetVariantType())
{ {
@@ -2162,7 +2162,7 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer(wxString const& varianttype,
[cell release]; [cell release];
} }
bool wxDataViewBitmapRenderer::Render() bool wxDataViewBitmapRenderer::MacRender()
// This method returns 'true' if // This method returns 'true' if
// - the passed bitmap is valid and it could be assigned to the native data browser; // - the passed bitmap is valid and it could be assigned to the native data browser;
// - the passed bitmap is invalid (or is not initialized); this case simulates a non-existing bitmap. // - the passed bitmap is invalid (or is not initialized); this case simulates a non-existing bitmap.
@@ -2198,7 +2198,7 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer(wxArrayString const& choices,
[cell release]; [cell release];
} }
bool wxDataViewChoiceRenderer::Render() bool wxDataViewChoiceRenderer::MacRender()
{ {
if (this->GetValue().GetType() == this->GetVariantType()) if (this->GetValue().GetType() == this->GetVariantType())
{ {
@@ -2236,7 +2236,7 @@ wxDataViewDateRenderer::wxDataViewDateRenderer(wxString const& varianttype, wxDa
[dateFormatter release]; [dateFormatter release];
} }
bool wxDataViewDateRenderer::Render() bool wxDataViewDateRenderer::MacRender()
{ {
if (this->GetValue().GetType() == this->GetVariantType()) if (this->GetValue().GetType() == this->GetVariantType())
{ {
@@ -2298,7 +2298,7 @@ wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& variantty
[cell release]; [cell release];
} }
bool wxDataViewIconTextRenderer::Render() bool wxDataViewIconTextRenderer::MacRender()
{ {
if (this->GetValue().GetType() == this->GetVariantType()) if (this->GetValue().GetType() == this->GetVariantType())
{ {
@@ -2339,7 +2339,7 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype,
[cell release]; [cell release];
} }
bool wxDataViewToggleRenderer::Render() bool wxDataViewToggleRenderer::MacRender()
{ {
if (this->GetValue().GetType() == this->GetVariantType()) if (this->GetValue().GetType() == this->GetVariantType())
{ {
@@ -2371,7 +2371,7 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& label, wx
[cell release]; [cell release];
} }
bool wxDataViewProgressRenderer::Render() bool wxDataViewProgressRenderer::MacRender()
{ {
if (this->GetValue().GetType() == this->GetVariantType()) if (this->GetValue().GetType() == this->GetVariantType())
{ {

3
src/osx/dataview_osx.cpp
View File

@@ -626,7 +626,8 @@ void wxDataViewCtrl::FinishCustomItemEditing(void)
} }
/*static*/ /*static*/
wxVisualAttributes wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant variant) wxVisualAttributes
wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
{ {
wxVisualAttributes attr; wxVisualAttributes attr;