From de40d7364730fd9556620ea5411689dad1c9e28a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 12 Oct 2009 13:59:32 +0000 Subject: [PATCH] No real changes, just minor cleanup in Cocoa wxDataViewCtrl. Start cleaning up Cocoa wxDataViewCtrl implementation: - Don't use "this->" which is not used anywhere else in wx code. - Use "()" instead of "(void)" as per wx coding standards. - Don't use end of function comments, this is inconsistent and unmaintainable. No real changes otherwise. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/carbon/dataview.h | 58 +-- include/wx/osx/cocoa/dataview.h | 68 ++-- include/wx/osx/dataview.h | 60 +-- src/osx/carbon/dataview.cpp | 638 +++++++++++++++---------------- src/osx/cocoa/dataview.mm | 326 ++++++++-------- src/osx/dataview_osx.cpp | 202 +++++----- 6 files changed, 676 insertions(+), 676 deletions(-) diff --git a/include/wx/osx/carbon/dataview.h b/include/wx/osx/carbon/dataview.h index 7f6962328d..501c5c95eb 100644 --- a/include/wx/osx/carbon/dataview.h +++ b/include/wx/osx/carbon/dataview.h @@ -26,7 +26,7 @@ public: // // constructors / destructor // - wxDataViewColumnNativeData(void) + wxDataViewColumnNativeData() { } wxDataViewColumnNativeData(DataBrowserPropertyID initPropertyID) @@ -37,14 +37,14 @@ public: // // data access methods // - DataBrowserPropertyID GetPropertyID(void) const + DataBrowserPropertyID GetPropertyID() const { - return this->m_PropertyID; + return m_PropertyID; } void SetPropertyID(DataBrowserPropertyID newPropertyID) { - this->m_PropertyID = newPropertyID; + m_PropertyID = newPropertyID; } protected: @@ -64,7 +64,7 @@ public: // // constructors / destructor // - wxDataViewRendererNativeData(void) + wxDataViewRendererNativeData() { } wxDataViewRendererNativeData(DataBrowserPropertyType initPropertyType, DataBrowserItemDataRef initItemDataRef=NULL) @@ -75,22 +75,22 @@ public: // // data access methods // - DataBrowserItemDataRef GetItemDataRef(void) const + DataBrowserItemDataRef GetItemDataRef() const { - return this->m_ItemDataRef; + return m_ItemDataRef; } - DataBrowserPropertyType GetPropertyType(void) const + DataBrowserPropertyType GetPropertyType() const { - return this->m_PropertyType; + return m_PropertyType; } void SetItemDataRef(DataBrowserItemDataRef newItemDataRef) { - this->m_ItemDataRef = newItemDataRef; + m_ItemDataRef = newItemDataRef; } void SetPropertyType(DataBrowserPropertyType newPropertyType) { - this->m_PropertyType = newPropertyType; + m_PropertyType = newPropertyType; } protected: @@ -126,10 +126,10 @@ public: // constructors / destructor // wxMacDataBrowserTableViewControl(wxWindow* peer, const wxPoint& pos, const wxSize& size, long style); - wxMacDataBrowserTableViewControl(void) + wxMacDataBrowserTableViewControl() { } - ~wxMacDataBrowserTableViewControl(void); + ~wxMacDataBrowserTableViewControl(); // // callback handling @@ -204,14 +204,14 @@ public: // OSStatus AddItem(DataBrowserItemID container, DataBrowserItemID const* itemID) // adds a single item { - return this->AddItems(container,1,itemID,kDataBrowserItemNoProperty); + return AddItems(container,1,itemID,kDataBrowserItemNoProperty); } OSStatus AddItems(DataBrowserItemID container, UInt32 numItems, DataBrowserItemID const* items, DataBrowserPropertyID preSortProperty); // adds items to the data browser OSStatus GetFreeItemID(DataBrowserItemID* id) const; // this method returns an item id that is valid and currently not used; if it cannot be found 'errDataBrowserItemNotAdded' is returned OSStatus GetItemCount (ItemCount* numItems) const { - return this->GetItemCount(kDataBrowserNoItem,true,kDataBrowserItemAnyState,numItems); + return GetItemCount(kDataBrowserNoItem,true,kDataBrowserItemAnyState,numItems); } OSStatus GetItemCount (DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, ItemCount* numItems) const; OSStatus GetItemID (DataBrowserTableViewRowIndex row, DataBrowserItemID* item) const; @@ -225,21 +225,21 @@ public: OSStatus RemoveItem(DataBrowserItemID container, DataBrowserItemID const* itemID) // removes a single item { - return this->RemoveItems(container,1,itemID,kDataBrowserItemNoProperty); + return RemoveItems(container,1,itemID,kDataBrowserItemNoProperty); } OSStatus RemoveItems(void) // removes all items { - return this->RemoveItems(kDataBrowserNoItem,0,NULL,kDataBrowserItemNoProperty); + return RemoveItems(kDataBrowserNoItem,0,NULL,kDataBrowserItemNoProperty); } OSStatus RemoveItems(DataBrowserItemID container, UInt32 numItems, DataBrowserItemID const* items, DataBrowserPropertyID preSortProperty); OSStatus UpdateItem(DataBrowserItemID container, DataBrowserItemID const* item) // updates all columns of the passed item { - return this->UpdateItems(container,1,item,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty); + return UpdateItems(container,1,item,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty); } OSStatus UpdateItems(void) // updates all items { - return this->UpdateItems(kDataBrowserNoItem,0,NULL,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty); + return UpdateItems(kDataBrowserNoItem,0,NULL,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty); } OSStatus UpdateItems(DataBrowserItemID container, UInt32 numItems, DataBrowserItemID const* items, DataBrowserPropertyID preSortProperty, DataBrowserPropertyID propertyID) const; @@ -370,7 +370,7 @@ public: // // column related methods (inherited from wxDataViewWidgetImpl) // - virtual bool ClearColumns (void); + virtual bool ClearColumns (); virtual bool DeleteColumn (wxDataViewColumn* columnPtr); virtual void DoSetExpanderColumn(wxDataViewColumn const* columnPtr); virtual wxDataViewColumn* GetColumn (unsigned int pos) const; @@ -385,10 +385,10 @@ public: virtual void Collapse (wxDataViewItem const& item); virtual void EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr); virtual void Expand (wxDataViewItem const& item); - virtual unsigned int GetCount (void) const; + virtual unsigned int GetCount () const; virtual wxRect GetRectangle (wxDataViewItem const& item, wxDataViewColumn const* columnPtr); virtual bool IsExpanded (wxDataViewItem const& item) const; - virtual bool Reload (void); + virtual bool Reload (); virtual bool Remove (wxDataViewItem const& parent, wxDataViewItem const& item); virtual bool Remove (wxDataViewItem const& parent, wxDataViewItemArray const& item); virtual bool Update (wxDataViewColumn const* columnPtr); @@ -406,15 +406,15 @@ public: virtual int GetSelections(wxDataViewItemArray& sel) const; virtual bool IsSelected (wxDataViewItem const& item) const; virtual void Select (wxDataViewItem const& item); - virtual void SelectAll (void); + virtual void SelectAll (); virtual void Unselect (wxDataViewItem const& item); - virtual void UnselectAll (void); + virtual void UnselectAll (); // // sorting related methods // - virtual wxDataViewColumn* GetSortingColumn (void) const; - virtual void Resort (void); + virtual wxDataViewColumn* GetSortingColumn () const; + virtual void Resort (); // // other methods (inherited from wxDataViewWidgetImpl) @@ -422,14 +422,14 @@ public: virtual void DoSetIndent (int indent); virtual void HitTest (wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const; virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height); - virtual void OnSize (void); + virtual void OnSize (); // // other methods // - wxDataViewCtrl* GetDataViewCtrl(void) const + wxDataViewCtrl* GetDataViewCtrl() const { - return dynamic_cast(this->GetWXPeer()); + return dynamic_cast(GetWXPeer()); } protected: diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h index 5253770865..9daf40170f 100644 --- a/include/wx/osx/cocoa/dataview.h +++ b/include/wx/osx/cocoa/dataview.h @@ -100,14 +100,14 @@ public: // // data access methods // - NSTableColumn* GetNativeColumnPtr(void) const + NSTableColumn* GetNativeColumnPtr() const { - return this->m_NativeColumnPtr; + return m_NativeColumnPtr; } void SetNativeColumnPtr(NSTableColumn* newNativeColumnPtr) { - this->m_NativeColumnPtr = newNativeColumnPtr; + m_NativeColumnPtr = newNativeColumnPtr; } protected: @@ -136,59 +136,59 @@ public: wxDataViewRendererNativeData(NSCell* initColumnCell, id initObject) : m_Object([initObject retain]), m_ColumnCell([initColumnCell retain]) { } - ~wxDataViewRendererNativeData(void) + ~wxDataViewRendererNativeData() { - [this->m_ColumnCell release]; - [this->m_Object release]; + [m_ColumnCell release]; + [m_Object release]; } // // data access methods // - NSCell* GetColumnCell(void) const + NSCell* GetColumnCell() const { - return this->m_ColumnCell; + return m_ColumnCell; } - NSTableColumn* GetColumnPtr(void) const + NSTableColumn* GetColumnPtr() const { - return this->m_TableColumnPtr; + return m_TableColumnPtr; } - id GetItem(void) const + id GetItem() const { - return this->m_Item; + return m_Item; } - NSCell* GetItemCell(void) const + NSCell* GetItemCell() const { - return this->m_ItemCell; + return m_ItemCell; } - id GetObject(void) const + id GetObject() const { - return this->m_Object; + return m_Object; } void SetColumnCell(NSCell* newCell) { [newCell retain]; - [this->m_ColumnCell release]; - this->m_ColumnCell = newCell; + [m_ColumnCell release]; + m_ColumnCell = newCell; } void SetColumnPtr(NSTableColumn* newColumnPtr) { - this->m_TableColumnPtr = newColumnPtr; + m_TableColumnPtr = newColumnPtr; } void SetItem(id newItem) { - this->m_Item = newItem; + m_Item = newItem; } void SetItemCell(NSCell* newCell) { - this->m_ItemCell = newCell; + m_ItemCell = newCell; } void SetObject(id newObject) { [newObject retain]; - [this->m_Object release]; - this->m_Object = newObject; + [m_Object release]; + m_Object = newObject; } protected: @@ -405,12 +405,12 @@ public: // constructors / destructor // wxCocoaDataViewControl(wxWindow* peer, wxPoint const& pos, wxSize const& size, long style); - ~wxCocoaDataViewControl(void); + ~wxCocoaDataViewControl(); // // column related methods (inherited from wxDataViewWidgetImpl) // - virtual bool ClearColumns (void); + virtual bool ClearColumns (); virtual bool DeleteColumn (wxDataViewColumn* columnPtr); virtual void DoSetExpanderColumn(wxDataViewColumn const* columnPtr); virtual wxDataViewColumn* GetColumn (unsigned int pos) const; @@ -425,10 +425,10 @@ public: virtual void Collapse (wxDataViewItem const& item); virtual void EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr); virtual void Expand (wxDataViewItem const& item); - virtual unsigned int GetCount (void) const; + virtual unsigned int GetCount () const; virtual wxRect GetRectangle (wxDataViewItem const& item, wxDataViewColumn const* columnPtr); virtual bool IsExpanded (wxDataViewItem const& item) const; - virtual bool Reload (void); + virtual bool Reload (); virtual bool Remove (wxDataViewItem const& parent, wxDataViewItem const& item); virtual bool Remove (wxDataViewItem const& parent, wxDataViewItemArray const& item); virtual bool Update (wxDataViewColumn const* columnPtr); @@ -446,15 +446,15 @@ public: virtual int GetSelections(wxDataViewItemArray& sel) const; virtual bool IsSelected (wxDataViewItem const& item) const; virtual void Select (wxDataViewItem const& item); - virtual void SelectAll (void); + virtual void SelectAll (); virtual void Unselect (wxDataViewItem const& item); - virtual void UnselectAll (void); + virtual void UnselectAll (); // // sorting related methods // - virtual wxDataViewColumn* GetSortingColumn (void) const; - virtual void Resort (void); + virtual wxDataViewColumn* GetSortingColumn () const; + virtual void Resort (); // // other methods (inherited from wxDataViewWidgetImpl) @@ -462,14 +462,14 @@ public: virtual void DoSetIndent (int indent); virtual void HitTest (wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const; virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height); - virtual void OnSize (void); + virtual void OnSize (); // // other methods // - wxDataViewCtrl* GetDataViewCtrl(void) const + wxDataViewCtrl* GetDataViewCtrl() const { - return dynamic_cast(this->GetWXPeer()); + return dynamic_cast(GetWXPeer()); } // diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h index b9bc5c576f..e564a42b70 100644 --- a/include/wx/osx/dataview.h +++ b/include/wx/osx/dataview.h @@ -33,22 +33,22 @@ public: // wxDataViewRenderer(wxString const& varianttype, wxDataViewCellMode mode=wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT); - virtual ~wxDataViewRenderer(void); + virtual ~wxDataViewRenderer(); // // inherited methods from wxDataViewRendererBase // virtual int GetAlignment() const { - return this->m_alignment; + return m_alignment; } virtual wxDataViewCellMode GetMode() const { - return this->m_mode; + return m_mode; } virtual bool GetValue(wxVariant& value) const { - value = this->m_value; + value = m_value; return true; } @@ -57,7 +57,7 @@ public: virtual void SetMode(wxDataViewCellMode mode); virtual bool SetValue(wxVariant const& newValue) { - this->m_value = newValue; + m_value = newValue; return true; } @@ -66,12 +66,12 @@ public: // wxVariant const& GetValue() const { - return this->m_value; + return m_value; } wxDataViewRendererNativeData* GetNativeData() const { - return this->m_NativeDataPtr; + return m_NativeDataPtr; } virtual bool MacRender() = 0; // a call to the native data browser function to render the data; @@ -238,11 +238,11 @@ public: // wxString GetChoice(size_t index) const { - return this->m_Choices[index]; + return m_Choices[index]; } - wxArrayString const& GetChoices(void) const + wxArrayString const& GetChoices() const { - return this->m_Choices; + return m_Choices; } private: @@ -352,7 +352,7 @@ public: int width = wxDVC_DEFAULT_WIDTH, wxAlignment align = wxALIGN_CENTER, int flags = wxDATAVIEW_COL_RESIZABLE); - virtual ~wxDataViewColumn(void); + virtual ~wxDataViewColumn(); // implement wxHeaderColumnBase pure virtual methods virtual wxAlignment GetAlignment() const { return m_alignment; } @@ -380,9 +380,9 @@ public: virtual void SetAsSortKey (bool sort = true); // implementation only - wxDataViewColumnNativeData* GetNativeData(void) const + wxDataViewColumnNativeData* GetNativeData() const { - return this->m_NativeDataPtr; + return m_NativeDataPtr; } void SetNativeData(wxDataViewColumnNativeData* newNativeDataPtr); // class takes ownership of pointer @@ -435,13 +435,13 @@ public: // Constructors / destructor: wxDataViewCtrl() { - this->Init(); + Init(); } wxDataViewCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator) { - this->Init(); - this->Create(parent, id, pos, size, style, validator ); + Init(); + Create(parent, id, pos, size, style, validator ); } ~wxDataViewCtrl(); @@ -459,12 +459,12 @@ public: virtual bool AssociateModel(wxDataViewModel* model); virtual bool AppendColumn (wxDataViewColumn* columnPtr); - virtual bool ClearColumns (void); + virtual bool ClearColumns (); virtual bool DeleteColumn (wxDataViewColumn* columnPtr); virtual wxDataViewColumn* GetColumn (unsigned int pos) const; - virtual unsigned int GetColumnCount (void) const; + virtual unsigned int GetColumnCount () const; virtual int GetColumnPosition(const wxDataViewColumn* columnPtr) const; - virtual wxDataViewColumn* GetSortingColumn (void) const; + virtual wxDataViewColumn* GetSortingColumn () const; virtual bool InsertColumn (unsigned int pos, wxDataViewColumn *col); virtual bool PrependColumn (wxDataViewColumn* columnPtr); @@ -494,36 +494,36 @@ public: // implementation // // returns a pointer to the native implementation - wxDataViewWidgetImpl* GetDataViewPeer(void) const; + wxDataViewWidgetImpl* GetDataViewPeer() const; // adds all children of the passed parent to the control; if 'parentItem' is invalid the root(s) is/are added: void AddChildren(wxDataViewItem const& parentItem); // finishes editing of custom items; if no custom item is currently edited the method does nothing - void FinishCustomItemEditing(void); + void FinishCustomItemEditing(); // returns the n-th pointer to a column; // this method is different from GetColumn(unsigned int pos) because here 'n' is not a position in the control but the n-th // position in the internal list/array of column pointers wxDataViewColumn* GetColumnPtr(size_t n) const { - return this->m_ColumnPtrs[n]; + return m_ColumnPtrs[n]; } // returns the current being rendered item of the customized renderer (this item is only valid during editing) wxDataViewItem const& GetCustomRendererItem() const { - return this->m_CustomRendererItem; + return m_CustomRendererItem; } // returns a pointer to a customized renderer (this pointer is only valid during editing) wxDataViewCustomRenderer* GetCustomRendererPtr() const { - return this->m_CustomRendererPtr; + return m_CustomRendererPtr; } // checks if currently a delete process is running bool IsDeleting() const { - return this->m_Deleting; + return m_Deleting; } // with CG, we need to get the context from an kEventControlDraw event @@ -532,27 +532,27 @@ public: // events so we can access it in the callbacks. void MacSetDrawingContext(void* context) { - this->m_cgContext = context; + m_cgContext = context; } void* MacGetDrawingContext() const { - return this->m_cgContext; + return m_cgContext; } // sets the currently being edited item of the custom renderer void SetCustomRendererItem(wxDataViewItem const& NewItem) { - this->m_CustomRendererItem = NewItem; + m_CustomRendererItem = NewItem; } // sets the custom renderer void SetCustomRendererPtr(wxDataViewCustomRenderer* NewCustomRendererPtr) { - this->m_CustomRendererPtr = NewCustomRendererPtr; + m_CustomRendererPtr = NewCustomRendererPtr; } // sets the flag indicating a deletion process: void SetDeleting(bool deleting) { - this->m_Deleting = deleting; + m_Deleting = deleting; } virtual wxVisualAttributes GetDefaultAttributes() const diff --git a/src/osx/carbon/dataview.cpp b/src/osx/carbon/dataview.cpp index a08481951f..c3724b0048 100644 --- a/src/osx/carbon/dataview.cpp +++ b/src/osx/carbon/dataview.cpp @@ -225,7 +225,7 @@ pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserCompareProc(ControlR return ControlPtr->DataBrowserCompareProc(itemOneID,itemTwoID,sortProperty); else return FALSE; -} /* wxMacDataBrowserTableViewControl::DataBrowserCompareProc(ControlRef, DataBrowserItemID, DataBrowserItemID, DataBrowserPropertyID) */ +} pascal void wxMacDataBrowserTableViewControl::DataBrowserGetContextualMenuProc(ControlRef browser, MenuRef* menu, UInt32* helpType, CFStringRef* helpItemString, AEDesc* selection) { @@ -234,7 +234,7 @@ pascal void wxMacDataBrowserTableViewControl::DataBrowserGetContextualMenuProc(C if (ControlPtr != NULL) ControlPtr->DataBrowserGetContextualMenuProc(menu,helpType,helpItemString,selection); -} /* wxMacDataBrowserTableViewControl::DataBrowserGetContextualMenuProc(ControlRef, MenuRef*, UInt32*, CFStringRef*, AEDesc*) */ +} pascal OSStatus wxMacDataBrowserTableViewControl::DataBrowserGetSetItemDataProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemDataRef itemData, Boolean getValue) { @@ -245,7 +245,7 @@ pascal OSStatus wxMacDataBrowserTableViewControl::DataBrowserGetSetItemDataProc( return ControlPtr->DataBrowserGetSetItemDataProc(itemID,propertyID,itemData,getValue); else return errDataBrowserPropertyNotSupported; -} /* wxMacDataBrowserTableViewControl::DataBrowserGetSetItemDataProc(ControlRef, DataBrowserItemID, DataBrowserPropertyID, DataBrowserItemDataRef, Boolean) */ +} pascal void wxMacDataBrowserTableViewControl::DataBrowserItemNotificationProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserItemNotification message, DataBrowserItemDataRef itemData) { @@ -254,7 +254,7 @@ pascal void wxMacDataBrowserTableViewControl::DataBrowserItemNotificationProc(Co if (ControlPtr != NULL) ControlPtr->DataBrowserItemNotificationProc(itemID,message,itemData); -} /* wxMacDataBrowserTableViewControl::DataBrowserItemNotificationProc(ControlRef, DataBrowserItemID, DataBrowserItemNotification, DataBrowserItemDataRef) */ +} pascal void wxMacDataBrowserTableViewControl::DataBrowserDrawItemProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemState state, Rect const* rectangle, SInt16 bitDepth, Boolean colorDevice) { @@ -263,7 +263,7 @@ pascal void wxMacDataBrowserTableViewControl::DataBrowserDrawItemProc(ControlRef if (ControlPtr != NULL) ControlPtr->DataBrowserDrawItemProc(itemID,propertyID,state,rectangle,bitDepth,colorDevice); -} /* wxMacDataBrowserTableViewControl::DataBrowserDrawItemProc(ControlRef, DataBrowserItemID, DataBrowserPropertyID, DataBrowserItemState, Rect const*, SInt16, Boolean) */ +} pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserEditItemProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserPropertyID propertyID, CFStringRef theString, Rect* maxEditTextRect, Boolean* shrinkToFit) { @@ -271,7 +271,7 @@ pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserEditItemProc(Control return ((ControlPtr != NULL) && ControlPtr->DataBrowserEditItemProc(itemID,propertyID,theString,maxEditTextRect,shrinkToFit)); -} /* wxMacDataBrowserTableViewControl::DataBrowserEditItemProc(ControlRef, DataBrowserItemID, DataBrowserPropertyID, CFStringRef, Rect*, Boolean*) */ +} pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserHitTestProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserPropertyID propertyID, Rect const* theRect, Rect const* mouseRect) { @@ -279,7 +279,7 @@ pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserHitTestProc(ControlR return ((ControlPtr != NULL) && ControlPtr->DataBrowserHitTestProc(itemID,propertyID,theRect,mouseRect)); -} /* wxMacDataBrowserTableViewControl::DataBrowserHitTestProc(ControlRef, DataBrowserItemID, DataBrowserPropertyID, Rect const*, Rect const*) */ +} pascal DataBrowserTrackingResult wxMacDataBrowserTableViewControl::DataBrowserTrackingProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserPropertyID propertyID, Rect const* theRect, Point startPt, EventModifiers modifiers) { @@ -290,7 +290,7 @@ pascal DataBrowserTrackingResult wxMacDataBrowserTableViewControl::DataBrowserTr return ControlPtr->DataBrowserTrackingProc(itemID,propertyID,theRect,startPt,modifiers); else return kDataBrowserNothingHit; -} /* wxMacDataBrowserTableViewControl::DataBrowserTrackingProc(ControlRef, DataBrowserItemID, DataBrowserPropertyID, Rect const*, Point, EventModifiers) */ +} pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserAcceptDragProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID) { @@ -298,7 +298,7 @@ pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserAcceptDragProc(Contr return ((controlPtr != NULL) && controlPtr->DataBrowserAcceptDragProc(dragRef,itemID)); -} /* wxMacDataBrowserTableViewControl::DataBrowserAcceptDragProc(ControlRef, DragReference, DataBrowserItemID) */ +} pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserAddDragItemProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID, ItemReference* itemRef) { @@ -306,7 +306,7 @@ pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserAddDragItemProc(Cont return ((controlPtr != NULL) && controlPtr->DataBrowserAddDragItemProc(dragRef,itemID,itemRef)); -} /* wxMacDataBrowserTableViewControl::DataBrowserAddDragItemProc(ControlRef, DragReference, DataBrowserItemID, ItemReference*) */ +} pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserReceiveDragProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID) { @@ -314,19 +314,19 @@ pascal Boolean wxMacDataBrowserTableViewControl::DataBrowserReceiveDragProc(Cont return ((controlPtr != NULL) && controlPtr->DataBrowserReceiveDragProc(dragRef,itemID)); -} /* wxMacDataBrowserTableViewControl::DataBrowserReceiveDragProc(ControlRef, DragReference, DataBrowserItemID) */ +} wxMacDataBrowserTableViewControl::wxMacDataBrowserTableViewControl(wxWindow* peer, wxPoint const& pos, wxSize const& size, long style) :wxMacControl(peer) { Rect bounds = wxMacGetBoundsForControl(peer,pos,size); - OSStatus err = ::CreateDataBrowserControl(MAC_WXHWND(peer->MacGetTopLevelWindowRef()),&bounds,kDataBrowserListView,&(this->m_controlRef)); + OSStatus err = ::CreateDataBrowserControl(MAC_WXHWND(peer->MacGetTopLevelWindowRef()),&bounds,kDataBrowserListView,&(m_controlRef)); SetReferenceInNativeControl(); verify_noerr(err); - ::InstallControlEventHandler(this->m_controlRef, GetDataBrowserCtrlEventHandlerUPP(), GetEventTypeCount(eventList), eventList, peer, (EventHandlerRef *)&m_macDataViewCtrlEventHandler); + ::InstallControlEventHandler(m_controlRef, GetDataBrowserCtrlEventHandlerUPP(), GetEventTypeCount(eventList), eventList, peer, (EventHandlerRef *)&m_macDataViewCtrlEventHandler); // setup standard callbacks: if (gDataBrowserTableViewGetContextualMenuUPP == NULL) gDataBrowserTableViewGetContextualMenuUPP = NewDataBrowserGetContextualMenuUPP(wxMacDataBrowserTableViewControl::DataBrowserGetContextualMenuProc); @@ -356,7 +356,7 @@ wxMacDataBrowserTableViewControl::wxMacDataBrowserTableViewControl(wxWindow* pee callbacks.u.v1.acceptDragCallback = gDataBrowserTableViewAcceptDragUPP; callbacks.u.v1.addDragItemCallback = gDataBrowserTableViewAddDragItemUPP; callbacks.u.v1.receiveDragCallback = gDataBrowserTableViewReceiveDragUPP; - this->SetCallbacks(&callbacks); + SetCallbacks(&callbacks); // setup callbacks for customized items: if (gDataBrowserTableViewDrawItemUPP == NULL) gDataBrowserTableViewDrawItemUPP = NewDataBrowserDrawItemUPP(wxMacDataBrowserTableViewControl::DataBrowserDrawItemProc); @@ -371,25 +371,25 @@ wxMacDataBrowserTableViewControl::wxMacDataBrowserTableViewControl(wxWindow* pee customCallbacks.u.v1.editTextCallback = gDataBrowserTableViewEditItemUPP; customCallbacks.u.v1.hitTestCallback = gDataBrowserTableViewHitTestUPP; customCallbacks.u.v1.trackingCallback = gDataBrowserTableViewTrackingUPP; - this->SetCustomCallbacks(&customCallbacks); + SetCustomCallbacks(&customCallbacks); // style setting: - this->EnableCellSizeModification( ((style & wxDV_VARIABLE_LINE_HEIGHT) != 0), true ); + EnableCellSizeModification( ((style & wxDV_VARIABLE_LINE_HEIGHT) != 0), true ); DataBrowserSelectionFlags flags; // variable definition - if (this->GetSelectionFlags(&flags) == noErr) // get default settings + if (GetSelectionFlags(&flags) == noErr) // get default settings { if ((style & wxDV_MULTIPLE) != 0) flags &= ~kDataBrowserSelectOnlyOne; else flags |= kDataBrowserSelectOnlyOne; - (void) this->SetSelectionFlags(flags); + (void) SetSelectionFlags(flags); } OptionBits attributes; // variable definition - if (this->GetAttributes(&attributes) == noErr) // get default settings + if (GetAttributes(&attributes) == noErr) // get default settings { if ((style & wxDV_VERT_RULES) != 0) attributes |= kDataBrowserAttributeListViewDrawColumnDividers; @@ -399,37 +399,37 @@ wxMacDataBrowserTableViewControl::wxMacDataBrowserTableViewControl(wxWindow* pee attributes |= kDataBrowserAttributeListViewAlternatingRowColors; else attributes &= ~kDataBrowserAttributeListViewAlternatingRowColors; - (void) this->SetAttributes(attributes); + (void) SetAttributes(attributes); } if ((style & wxDV_NO_HEADER) != 0) - this->SetHeaderButtonHeight(0); -} /* wxMacDataBrowserTableViewControl::wxMacDataBrowserTableViewControl(wxWindow*, wxPoint const&, wxSize const&, long) */ + SetHeaderButtonHeight(0); +} -wxMacDataBrowserTableViewControl::~wxMacDataBrowserTableViewControl(void) +wxMacDataBrowserTableViewControl::~wxMacDataBrowserTableViewControl() { ::RemoveEventHandler((EventHandlerRef) m_macDataViewCtrlEventHandler); -} /* wxMacDataBrowserTableViewControl::~wxMacDataBrowserTableViewControl(void) */ +} // // callback handling // OSStatus wxMacDataBrowserTableViewControl::SetCallbacks(DataBrowserCallbacks const* callbacks) { - return ::SetDataBrowserCallbacks(this->m_controlRef,callbacks); -} /* wxMacDataBrowserTableViewControl::SetCallbacks(DataBrowserCallbacks const*) */ + return ::SetDataBrowserCallbacks(m_controlRef,callbacks); +} OSStatus wxMacDataBrowserTableViewControl::SetCustomCallbacks(DataBrowserCustomCallbacks const* customCallbacks) { - return ::SetDataBrowserCustomCallbacks(this->m_controlRef,customCallbacks); -} /* xMacDataBrowserTableViewControl::SetCustomCallbacks(DataBrowserCustomCallbacks const*) */ + return ::SetDataBrowserCustomCallbacks(m_controlRef,customCallbacks); +} // // DnD handling // OSStatus wxMacDataBrowserTableViewControl::EnableAutomaticDragTracking(bool enable) { - return ::SetAutomaticControlDragTrackingEnabledForWindow(::GetControlOwner(this->m_controlRef),enable); + return ::SetAutomaticControlDragTrackingEnabledForWindow(::GetControlOwner(m_controlRef),enable); } // @@ -438,12 +438,12 @@ OSStatus wxMacDataBrowserTableViewControl::EnableAutomaticDragTracking(bool enab OSStatus wxMacDataBrowserTableViewControl::GetHeaderDesc(DataBrowserPropertyID propertyID, DataBrowserListViewHeaderDesc* desc) const { desc->version = kDataBrowserListViewLatestHeaderDesc; // if this statement is missing the next call will fail (NOT DOCUMENTED!!) - return ::GetDataBrowserListViewHeaderDesc(this->m_controlRef,propertyID,desc); + return ::GetDataBrowserListViewHeaderDesc(m_controlRef,propertyID,desc); } OSStatus wxMacDataBrowserTableViewControl::SetHeaderDesc(DataBrowserPropertyID propertyID, DataBrowserListViewHeaderDesc* desc) { - return ::SetDataBrowserListViewHeaderDesc(this->m_controlRef,propertyID,desc); + return ::SetDataBrowserListViewHeaderDesc(m_controlRef,propertyID,desc); } // @@ -451,102 +451,102 @@ OSStatus wxMacDataBrowserTableViewControl::SetHeaderDesc(DataBrowserPropertyID p // OSStatus wxMacDataBrowserTableViewControl::AutoSizeColumns() { - return AutoSizeDataBrowserListViewColumns(this->m_controlRef); + return AutoSizeDataBrowserListViewColumns(m_controlRef); } OSStatus wxMacDataBrowserTableViewControl::EnableCellSizeModification(bool enableHeight, bool enableWidth) { - return ::SetDataBrowserTableViewGeometry(this->GetControlRef(),enableWidth,enableHeight); -} /* wxMacDataBrowserTableViewControl::EnableCellSizeModification(bool, bool) */ + return ::SetDataBrowserTableViewGeometry(GetControlRef(),enableWidth,enableHeight); +} OSStatus wxMacDataBrowserTableViewControl::GetAttributes(OptionBits* attributes) { - return ::DataBrowserGetAttributes(this->GetControlRef(),attributes); -} /* wxMacDataBrowserTableViewControl::GetAttributes(OptionBits*) */ + return ::DataBrowserGetAttributes(GetControlRef(),attributes); +} OSStatus wxMacDataBrowserTableViewControl::GetColumnWidth(DataBrowserPropertyID propertyID, UInt16* width) const { - return ::GetDataBrowserTableViewNamedColumnWidth(this->m_controlRef,propertyID,width); + return ::GetDataBrowserTableViewNamedColumnWidth(m_controlRef,propertyID,width); } OSStatus wxMacDataBrowserTableViewControl::GetDefaultColumnWidth( UInt16 *width ) const { - return GetDataBrowserTableViewColumnWidth(this->m_controlRef, width ); + return GetDataBrowserTableViewColumnWidth(m_controlRef, width ); } OSStatus wxMacDataBrowserTableViewControl::GetDefaultRowHeight(UInt16* height) const { - return ::GetDataBrowserTableViewRowHeight(this->m_controlRef,height); + return ::GetDataBrowserTableViewRowHeight(m_controlRef,height); } OSStatus wxMacDataBrowserTableViewControl::GetHeaderButtonHeight(UInt16 *height) { - return ::GetDataBrowserListViewHeaderBtnHeight(this->m_controlRef,height); + return ::GetDataBrowserListViewHeaderBtnHeight(m_controlRef,height); } OSStatus wxMacDataBrowserTableViewControl::GetPartBounds(DataBrowserItemID item, DataBrowserPropertyID propertyID, DataBrowserPropertyPart part, Rect* bounds) { - return ::GetDataBrowserItemPartBounds(this->m_controlRef,item,propertyID,part,bounds); -} /* wxMacDataBrowserTableViewControl::GetPartBounds(DataBrowserItemID, DataBrowswerPropertyID, DataBrowserPropertyPart, Rect*) */ + return ::GetDataBrowserItemPartBounds(m_controlRef,item,propertyID,part,bounds); +} OSStatus wxMacDataBrowserTableViewControl::GetRowHeight(DataBrowserItemID item, UInt16* height) const { - return ::GetDataBrowserTableViewItemRowHeight(this->m_controlRef,item,height); -} /* wxMacDataBrowserTableViewControl::GetRowHeight(DataBrowserItemID, UInt16*) const */ + return ::GetDataBrowserTableViewItemRowHeight(m_controlRef,item,height); +} OSStatus wxMacDataBrowserTableViewControl::GetScrollPosition( UInt32 *top , UInt32 *left ) const { - return GetDataBrowserScrollPosition(this->m_controlRef, top , left ); + return GetDataBrowserScrollPosition(m_controlRef, top , left ); } OSStatus wxMacDataBrowserTableViewControl::SetAttributes(OptionBits attributes) { - return ::DataBrowserChangeAttributes(this->GetControlRef(),attributes,~attributes); -} /* wxMacDataBrowserTableViewControl::SetAttributes(OptionBits) */ + return ::DataBrowserChangeAttributes(GetControlRef(),attributes,~attributes); +} OSStatus wxMacDataBrowserTableViewControl::SetColumnWidth(DataBrowserPropertyID propertyID, UInt16 width) { - return ::SetDataBrowserTableViewNamedColumnWidth(this->m_controlRef,propertyID,width); + return ::SetDataBrowserTableViewNamedColumnWidth(m_controlRef,propertyID,width); } OSStatus wxMacDataBrowserTableViewControl::SetDefaultColumnWidth(UInt16 width) { - return ::SetDataBrowserTableViewColumnWidth(this->m_controlRef,width); + return ::SetDataBrowserTableViewColumnWidth(m_controlRef,width); } OSStatus wxMacDataBrowserTableViewControl::SetDefaultRowHeight(UInt16 height) { - return ::SetDataBrowserTableViewRowHeight(this->m_controlRef,height); + return ::SetDataBrowserTableViewRowHeight(m_controlRef,height); } OSStatus wxMacDataBrowserTableViewControl::SetHasScrollBars(bool horiz, bool vert) { - return ::SetDataBrowserHasScrollBars(this->m_controlRef,horiz,vert); -} /* wxMacDataBrowserTableViewControl::SetHasScrollBars(bool, bool) */ + return ::SetDataBrowserHasScrollBars(m_controlRef,horiz,vert); +} OSStatus wxMacDataBrowserTableViewControl::SetHeaderButtonHeight(UInt16 height) { - return ::SetDataBrowserListViewHeaderBtnHeight(this->m_controlRef,height); -} /* wxMacDataBrowserTableViewControl::SetHeaderButtonHeight(UInt16) */ + return ::SetDataBrowserListViewHeaderBtnHeight(m_controlRef,height); +} OSStatus wxMacDataBrowserTableViewControl::SetHiliteStyle(DataBrowserTableViewHiliteStyle hiliteStyle) { - return ::SetDataBrowserTableViewHiliteStyle(this->m_controlRef,hiliteStyle); -} /*wxMacDataBrowserTableViewControl::SetHiliteStyle(DataBrowserTableViewHiliteStyle) */ + return ::SetDataBrowserTableViewHiliteStyle(m_controlRef,hiliteStyle); +} OSStatus wxMacDataBrowserTableViewControl::SetIndent(float Indent) { - return ::DataBrowserSetMetric(this->m_controlRef,kDataBrowserMetricDisclosureColumnPerDepthGap,true,Indent); -} /* wxMacDataBrowserTableViewControl::SetIndent(float* Indent) */ + return ::DataBrowserSetMetric(m_controlRef,kDataBrowserMetricDisclosureColumnPerDepthGap,true,Indent); +} OSStatus wxMacDataBrowserTableViewControl::SetItemRowHeight(DataBrowserItemID item, UInt16 height) { - return ::SetDataBrowserTableViewItemRowHeight(this->m_controlRef,item,height); + return ::SetDataBrowserTableViewItemRowHeight(m_controlRef,item,height); } OSStatus wxMacDataBrowserTableViewControl::SetScrollPosition(UInt32 top, UInt32 left) { - return ::SetDataBrowserScrollPosition(this->m_controlRef,top,left); + return ::SetDataBrowserScrollPosition(m_controlRef,top,left); } // @@ -554,36 +554,36 @@ OSStatus wxMacDataBrowserTableViewControl::SetScrollPosition(UInt32 top, UInt32 // OSStatus wxMacDataBrowserTableViewControl::GetColumnCount(UInt32* numColumns) const { - return ::GetDataBrowserTableViewColumnCount(this->m_controlRef,numColumns); + return ::GetDataBrowserTableViewColumnCount(m_controlRef,numColumns); } OSStatus wxMacDataBrowserTableViewControl::GetColumnIndex(DataBrowserPropertyID propertyID, DataBrowserTableViewColumnIndex* index) const { - return ::GetDataBrowserTableViewColumnPosition(this->m_controlRef,propertyID,index); -} /* wxMacDataBrowserTableViewControl::GetColumnIndex(DataBrowserPropertyID, DataBrowserTableViewColumnIndex*) const */ + return ::GetDataBrowserTableViewColumnPosition(m_controlRef,propertyID,index); +} OSStatus wxMacDataBrowserTableViewControl::GetFreePropertyID(DataBrowserPropertyID* propertyID) const { for (*propertyID=kMinPropertyID; *propertyID::max(); ++(*propertyID)) - if (this->IsUsedPropertyID(*propertyID) == errDataBrowserPropertyNotFound) + if (IsUsedPropertyID(*propertyID) == errDataBrowserPropertyNotFound) return noErr; return errDataBrowserPropertyNotSupported; -} /* wxMacDataBrowserTableViewControl::GetFreePropertyID(DataBrowserPropertyID*) const */ +} OSStatus wxMacDataBrowserTableViewControl::GetPropertyFlags(DataBrowserPropertyID propertyID, DataBrowserPropertyFlags *flags) const { - return ::GetDataBrowserPropertyFlags(this->m_controlRef,propertyID,flags); + return ::GetDataBrowserPropertyFlags(m_controlRef,propertyID,flags); } OSStatus wxMacDataBrowserTableViewControl::GetPropertyID(DataBrowserItemDataRef itemData, DataBrowserPropertyID* propertyID) const { return ::GetDataBrowserItemDataProperty(itemData,propertyID); -} /* wxMacDataBrowserTableViewControl::GetPropertyID(DataBrowserItemDataRef, DataBrowserPropertyID*) */ +} OSStatus wxMacDataBrowserTableViewControl::GetPropertyID(DataBrowserTableViewColumnIndex index, DataBrowserTableViewColumnID* propertyID) const { - return ::GetDataBrowserTableViewColumnProperty(this->m_controlRef,index,propertyID); -} /* wxMacDataBrowserTableViewControl::GetPropertyID(DataBrowserTableViewColumnIndex, DataBrowserTableViewColumnID*) */ + return ::GetDataBrowserTableViewColumnProperty(m_controlRef,index,propertyID); +} OSStatus wxMacDataBrowserTableViewControl::IsUsedPropertyID(DataBrowserPropertyID propertyID) const { @@ -592,45 +592,45 @@ OSStatus wxMacDataBrowserTableViewControl::IsUsedPropertyID(DataBrowserPropertyI // the column position for the property id: DataBrowserTableViewColumnIndex index; - return ::GetDataBrowserTableViewColumnPosition(this->m_controlRef,propertyID,&index); -} /* wxMacDataBrowserTableViewControl::IsUsedPropertyId(DataBrowserPropertyID) const */ + return ::GetDataBrowserTableViewColumnPosition(m_controlRef,propertyID,&index); +} OSStatus wxMacDataBrowserTableViewControl::RemoveColumnByProperty(DataBrowserTableViewColumnID propertyID) { - return ::RemoveDataBrowserTableViewColumn(this->m_controlRef,propertyID); -} /* wxMacDataBrowserTableViewControl::RemoveColumnByProperty(DataBrowserTableViewColumnID) */ + return ::RemoveDataBrowserTableViewColumn(m_controlRef,propertyID); +} OSStatus wxMacDataBrowserTableViewControl::RemoveColumnByIndex(DataBrowserTableViewColumnIndex index) { DataBrowserTableViewColumnID propertyID; - this->GetPropertyID(index,&propertyID); - return ::RemoveDataBrowserTableViewColumn(this->m_controlRef,propertyID); -} /* wxMacDataBrowserTableViewControl::RemoveColumnByIndex(DataBrowserTableViewColumnIndex) */ + GetPropertyID(index,&propertyID); + return ::RemoveDataBrowserTableViewColumn(m_controlRef,propertyID); +} OSStatus wxMacDataBrowserTableViewControl::SetColumnIndex(DataBrowserPropertyID propertyID, DataBrowserTableViewColumnIndex index) { - return ::SetDataBrowserTableViewColumnPosition(this->m_controlRef,propertyID,index); -} /* wxMacDataBrowserTableViewControl::SetColumnIndex(DataBrowserPropertyID, DataBrowserTableViewColumnIndex) */ + return ::SetDataBrowserTableViewColumnPosition(m_controlRef,propertyID,index); +} OSStatus wxMacDataBrowserTableViewControl::SetDisclosureColumn(DataBrowserPropertyID propertyID, Boolean expandableRows) { - return ::SetDataBrowserListViewDisclosureColumn(this->m_controlRef,propertyID,expandableRows); + return ::SetDataBrowserListViewDisclosureColumn(m_controlRef,propertyID,expandableRows); } OSStatus wxMacDataBrowserTableViewControl::SetPropertyFlags(DataBrowserPropertyID propertyID, DataBrowserPropertyFlags flags) { - return ::SetDataBrowserPropertyFlags(this->m_controlRef,propertyID,flags); -} /* wxMacDataBrowserTableViewControl::SetPropertyFlags(DataBrowserPropertyID, DataBrowserPropertyFlags) */ + return ::SetDataBrowserPropertyFlags(m_controlRef,propertyID,flags); +} // // item handling // OSStatus wxMacDataBrowserTableViewControl::AddItems(DataBrowserItemID container, UInt32 numItems, DataBrowserItemID const* items, DataBrowserPropertyID preSortProperty) { - return ::AddDataBrowserItems(this->m_controlRef,container,numItems,items,preSortProperty); -} /* wxMacDataBrowserTableViewControl::AddItems(DataBrowserItemID, UInt32, DataBrowserItemID const*, DataBrowserPropertyID) */ + return ::AddDataBrowserItems(m_controlRef,container,numItems,items,preSortProperty); +} OSStatus wxMacDataBrowserTableViewControl::GetFreeItemID(DataBrowserItemID* id) const { @@ -639,7 +639,7 @@ OSStatus wxMacDataBrowserTableViewControl::GetFreeItemID(DataBrowserItemID* id) OSStatus status; - status = this->GetItemCount(&noOfItems); + status = GetItemCount(&noOfItems); wxCHECK_MSG(status == noErr,status,_("Could not retrieve number of items")); if (noOfItems == 0) { @@ -651,40 +651,40 @@ OSStatus wxMacDataBrowserTableViewControl::GetFreeItemID(DataBrowserItemID* id) // as there might be a lot of items in the data browser and mostly the data is added item by item the largest used ID number is roughly in the order of magnitude // as the number of items; therefore, start from the number of items to look for a new ID: for (*id=noOfItems; *id::max(); ++(*id)) - if (this->IsUsedItemID(*id) == errDataBrowserItemNotFound) + if (IsUsedItemID(*id) == errDataBrowserItemNotFound) return noErr; // as the first approach was not successful, try from the beginning: for (*id=0; *idIsUsedItemID(*id) == errDataBrowserItemNotFound) + if (IsUsedItemID(*id) == errDataBrowserItemNotFound) return noErr; // sorry, data browser is full: return errDataBrowserItemNotAdded; } -} /* wxMacDataBrowserTableViewControl::GetFreeItemID(DataBrowserItemID*) const */ +} OSStatus wxMacDataBrowserTableViewControl::GetItemCount(DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, ItemCount* numItems) const { - return GetDataBrowserItemCount(this->m_controlRef,container,recurse,state,numItems); -} /* wxMacDataBrowserTableViewControl::GetItemCount(DataBrowserItemID, Boolean, DataBrowserItemState, ItemCount*) const */ + return GetDataBrowserItemCount(m_controlRef,container,recurse,state,numItems); +} OSStatus wxMacDataBrowserTableViewControl::GetItemID( DataBrowserTableViewRowIndex row, DataBrowserItemID * item ) const { - return GetDataBrowserTableViewItemID(this->m_controlRef,row,item); + return GetDataBrowserTableViewItemID(m_controlRef,row,item); } OSStatus wxMacDataBrowserTableViewControl::GetItems(DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, Handle items) const { - return GetDataBrowserItems(this->m_controlRef,container,recurse,state,items); -} /* wxMacDataBrowserTableViewControl::GetItems(DataBrowserItemID, Boolean, DataBrowserItemState, Handle) const */ + return GetDataBrowserItems(m_controlRef,container,recurse,state,items); +} OSStatus wxMacDataBrowserTableViewControl::GetItemRow(DataBrowserItemID item, DataBrowserTableViewRowIndex* row) const { - return GetDataBrowserTableViewItemRow(this->m_controlRef,item,row); + return GetDataBrowserTableViewItemRow(m_controlRef,item,row); } OSStatus wxMacDataBrowserTableViewControl::GetItemState(DataBrowserItemID item, DataBrowserItemState* state) const { - return ::GetDataBrowserItemState(this->m_controlRef,item,state); + return ::GetDataBrowserItemState(m_controlRef,item,state); } OSStatus wxMacDataBrowserTableViewControl::IsUsedItemID(DataBrowserItemID itemID) const @@ -694,23 +694,23 @@ OSStatus wxMacDataBrowserTableViewControl::IsUsedItemID(DataBrowserItemID itemID // the column position for the property id: DataBrowserTableViewColumnIndex index; - return ::GetDataBrowserTableViewItemRow(this->m_controlRef,itemID,&index); -} /* wxMacDataBrowserTableViewControl::IsUsedItemID(DataBrowserItemID) const */ + return ::GetDataBrowserTableViewItemRow(m_controlRef,itemID,&index); +} OSStatus wxMacDataBrowserTableViewControl::RemoveItems(DataBrowserItemID container, UInt32 numItems, DataBrowserItemID const* items, DataBrowserPropertyID preSortProperty) { - return ::RemoveDataBrowserItems(this->m_controlRef,container,numItems,items,preSortProperty); + return ::RemoveDataBrowserItems(m_controlRef,container,numItems,items,preSortProperty); } OSStatus wxMacDataBrowserTableViewControl::RevealItem(DataBrowserItemID item, DataBrowserPropertyID propertyID, DataBrowserRevealOptions options) const { - return ::RevealDataBrowserItem(this->m_controlRef,item,propertyID,options); -} /* wxMacDataBrowserTableViewControl::RevealItem(DataBrowserItemID item, DataBrowserPropertyID propertyID, DataBrowserRevealOptions options) const */ + return ::RevealDataBrowserItem(m_controlRef,item,propertyID,options); +} OSStatus wxMacDataBrowserTableViewControl::UpdateItems(DataBrowserItemID container, UInt32 numItems, DataBrowserItemID const* items, DataBrowserPropertyID preSortProperty, DataBrowserPropertyID propertyID) const { - return UpdateDataBrowserItems(this->m_controlRef,container,numItems,items,preSortProperty,propertyID); + return UpdateDataBrowserItems(m_controlRef,container,numItems,items,preSortProperty,propertyID); } // @@ -724,7 +724,7 @@ size_t wxMacDataBrowserTableViewControl::GetSelectedItemIDs(wxArrayDataBrowserIt size_t noOfItems; - wxCHECK_MSG(this->GetItems(kDataBrowserNoItem,true,kDataBrowserItemIsSelected,handle) == noErr,0,_("Could not get selected items.")); + wxCHECK_MSG(GetItems(kDataBrowserNoItem,true,kDataBrowserItemIsSelected,handle) == noErr,0,_("Could not get selected items.")); noOfItems = static_cast(::GetHandleSize(handle)/sizeof(DataBrowserItemID)); itemIDs.Empty(); itemIDs.Alloc(noOfItems); @@ -738,56 +738,56 @@ size_t wxMacDataBrowserTableViewControl::GetSelectedItemIDs(wxArrayDataBrowserIt HUnlock(handle); DisposeHandle(handle); return noOfItems; -} /* wxMacDataBrowserTableViewControl::GetSelectedItemIDs(wxArrayDataBrowserItemID&) const*/ +} OSStatus wxMacDataBrowserTableViewControl::GetSelectionAnchor(DataBrowserItemID* first, DataBrowserItemID* last) const { - return ::GetDataBrowserSelectionAnchor(this->m_controlRef,first,last); -} /* wxMacDataBrowserTableViewControl::GetSelectionAnchor(DataBrowserItemID*, DataBrowserItemID*) const */ + return ::GetDataBrowserSelectionAnchor(m_controlRef,first,last); +} OSStatus wxMacDataBrowserTableViewControl::GetSelectionFlags(DataBrowserSelectionFlags* flags) const { - return ::GetDataBrowserSelectionFlags(this->m_controlRef,flags); -} /* wxMacDataBrowserTableViewControl::GetSelectionFlags(DataBrowserSelectionFlags*) const */ + return ::GetDataBrowserSelectionFlags(m_controlRef,flags); +} bool wxMacDataBrowserTableViewControl::IsItemSelected(DataBrowserItemID item) const { - return ::IsDataBrowserItemSelected(this->m_controlRef,item); -} /* wxMacDataBrowserTableViewControl::IsItemSelected(DataBrowserItemID) const */ + return ::IsDataBrowserItemSelected(m_controlRef,item); +} OSStatus wxMacDataBrowserTableViewControl::SetSelectionFlags(DataBrowserSelectionFlags flags) { - return ::SetDataBrowserSelectionFlags(this->m_controlRef,flags); -} /* wxMacDataBrowserTableViewControl::SetSelectionFlags(DataBrowserSelectionFlags) */ + return ::SetDataBrowserSelectionFlags(m_controlRef,flags); +} OSStatus wxMacDataBrowserTableViewControl::SetSelectedItems(UInt32 numItems, DataBrowserItemID const* items, DataBrowserSetOption operation) { - return ::SetDataBrowserSelectedItems(this->m_controlRef, numItems, items, operation ); -} /* wxMacDataBrowserTableViewControl::SetSelectedItems(UInt32, DataBrowserItemID const*, DataBrowserSetOption) */ + return ::SetDataBrowserSelectedItems(m_controlRef, numItems, items, operation ); +} OSStatus wxMacDataBrowserTableViewControl::GetSortOrder(DataBrowserSortOrder* order) const { - return ::GetDataBrowserSortOrder(this->m_controlRef,order); + return ::GetDataBrowserSortOrder(m_controlRef,order); } OSStatus wxMacDataBrowserTableViewControl::GetSortProperty(DataBrowserPropertyID* propertyID) const { - return ::GetDataBrowserSortProperty(this->m_controlRef,propertyID); + return ::GetDataBrowserSortProperty(m_controlRef,propertyID); } OSStatus wxMacDataBrowserTableViewControl::Resort(DataBrowserItemID container, Boolean sortChildren) { - return ::SortDataBrowserContainer(this->m_controlRef,container,sortChildren); -} /* wxMacDataBrowserTableViewControl::Resort(DataBrowserItemID, Boolean) */ + return ::SortDataBrowserContainer(m_controlRef,container,sortChildren); +} OSStatus wxMacDataBrowserTableViewControl::SetSortOrder(DataBrowserSortOrder order) { - return ::SetDataBrowserSortOrder(this->m_controlRef,order); + return ::SetDataBrowserSortOrder(m_controlRef,order); } OSStatus wxMacDataBrowserTableViewControl::SetSortProperty(DataBrowserPropertyID propertyID) { - return ::SetDataBrowserSortProperty(this->m_controlRef,propertyID); + return ::SetDataBrowserSortProperty(m_controlRef,propertyID); } // @@ -795,13 +795,13 @@ OSStatus wxMacDataBrowserTableViewControl::SetSortProperty(DataBrowserPropertyID // OSStatus wxMacDataBrowserTableViewControl::CloseContainer(DataBrowserItemID containerID) { - return ::CloseDataBrowserContainer(this->m_controlRef,containerID); -} /* wxMacDataBrowserTableViewControl::CloseContainer(DataBrowserItemID) */ + return ::CloseDataBrowserContainer(m_controlRef,containerID); +} OSStatus wxMacDataBrowserTableViewControl::OpenContainer(DataBrowserItemID containerID) { - return ::OpenDataBrowserContainer(this->m_controlRef,containerID); -} /* wxMacDataBrowserTableViewControl::OpenContainer(DataBrowserItemID) */ + return ::OpenDataBrowserContainer(m_controlRef,containerID); +} IMPLEMENT_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl,wxMacControl) @@ -814,8 +814,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl,wxMacControl) // OSStatus wxMacDataBrowserListViewControl::AddColumn(DataBrowserListViewColumnDesc *columnDesc, DataBrowserTableViewColumnIndex position) { - return AddDataBrowserListViewColumn(this->m_controlRef,columnDesc,position); -} /* wxMacDataBrowserListViewControl::AddColumn(DataBrowserListViewColumnDesc*, DataBrowserTableViewColumnIndex) */ + return AddDataBrowserListViewColumn(m_controlRef,columnDesc,position); +} // ============================================================================ // wxMacDataViewDataBrowserListViewControl @@ -828,33 +828,33 @@ wxMacDataViewDataBrowserListViewControl::wxMacDataViewDataBrowserListViewControl :wxMacDataBrowserListViewControl(peer,pos,size,style) { if ((style & wxBORDER_NONE) != 0) - this->SetData(kControlNoPart,kControlDataBrowserIncludesFrameAndFocusTag,(Boolean) false); - (void) this->EnableAutomaticDragTracking(); - (void) this->SetHiliteStyle(kDataBrowserTableViewFillHilite); -} /* wxMacDataViewDataBrowserListViewControl::wxMacDataViewDataBrowserListViewControl(wxWindow* , const wxPoint&, const wxSize&, long) */ + SetData(kControlNoPart,kControlDataBrowserIncludesFrameAndFocusTag,(Boolean) false); + (void) EnableAutomaticDragTracking(); + (void) SetHiliteStyle(kDataBrowserTableViewFillHilite); +} // // column related methods (inherited from wxDataViewWidgetImpl) // -bool wxMacDataViewDataBrowserListViewControl::ClearColumns(void) +bool wxMacDataViewDataBrowserListViewControl::ClearColumns() { UInt32 noOfColumns; - wxCHECK_MSG(this->GetColumnCount(&noOfColumns) == noErr,false,_("Could not determine number of columns.")); + wxCHECK_MSG(GetColumnCount(&noOfColumns) == noErr,false,_("Could not determine number of columns.")); for (UInt32 i=0; iRemoveColumnByIndex(0) == noErr,false,_("Could not remove column.")); + wxCHECK_MSG(RemoveColumnByIndex(0) == noErr,false,_("Could not remove column.")); return true; } bool wxMacDataViewDataBrowserListViewControl::DeleteColumn(wxDataViewColumn* columnPtr) { - return (this->RemoveColumnByProperty(columnPtr->GetNativeData()->GetPropertyID()) == noErr); + return (RemoveColumnByProperty(columnPtr->GetNativeData()->GetPropertyID()) == noErr); } void wxMacDataViewDataBrowserListViewControl::DoSetExpanderColumn(wxDataViewColumn const* columnPtr) { - this->SetDisclosureColumn(columnPtr->GetNativeData()->GetPropertyID(),false); // second parameter explicitely passed to ensure that arrow is centered + SetDisclosureColumn(columnPtr->GetNativeData()->GetPropertyID(),false); // second parameter explicitely passed to ensure that arrow is centered } wxDataViewColumn* wxMacDataViewDataBrowserListViewControl::GetColumn(unsigned int pos) const @@ -862,8 +862,8 @@ wxDataViewColumn* wxMacDataViewDataBrowserListViewControl::GetColumn(unsigned in DataBrowserPropertyID propertyID; - if (this->GetPropertyID(pos,&propertyID) == noErr) - return this->GetColumnPtr(propertyID); + if (GetPropertyID(pos,&propertyID) == noErr) + return GetColumnPtr(propertyID); else return NULL; } @@ -874,7 +874,7 @@ int wxMacDataViewDataBrowserListViewControl::GetColumnPosition(wxDataViewColumn { DataBrowserTableViewColumnIndex Position; - wxCHECK_MSG(this->GetColumnIndex(columnPtr->GetNativeData()->GetPropertyID(),&Position) == noErr,wxNOT_FOUND,_("Could not determine column's position")); + wxCHECK_MSG(GetColumnIndex(columnPtr->GetNativeData()->GetPropertyID(),&Position) == noErr,wxNOT_FOUND,_("Could not determine column's position")); return static_cast(Position); } else @@ -889,28 +889,28 @@ bool wxMacDataViewDataBrowserListViewControl::InsertColumn(unsigned int pos, wxD UInt32 noOfColumns; - wxCFStringRef title(columnPtr->GetTitle(),m_font.Ok() ? dynamic_cast(this->GetWXPeer())->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()); + wxCFStringRef title(columnPtr->GetTitle(),m_font.Ok() ? dynamic_cast(GetWXPeer())->GetFont().GetEncoding() : wxLocale::GetSystemEncoding()); // try to get new ID for the column: - wxCHECK_MSG(this->GetFreePropertyID(&newPropertyID) == noErr,false,_("Cannot create new column's ID. Probably max. number of columns reached.")); + wxCHECK_MSG(GetFreePropertyID(&newPropertyID) == noErr,false,_("Cannot create new column's ID. Probably max. number of columns reached.")); // set native data: columnPtr->GetNativeData()->SetPropertyID(newPropertyID); // create a column description, add column to the native control and do some final layout adjustments: wxCHECK_MSG(::InitializeColumnDescription(columnDescription,columnPtr,title), false,_("Column description could not be initialized.")); - wxCHECK_MSG(this->AddColumn(&columnDescription,pos) == noErr, false,_("Column could not be added.")); - wxCHECK_MSG(this->SetColumnWidth(newPropertyID,columnPtr->GetWidth()) == noErr,false,_("Column width could not be set.")); - wxCHECK_MSG(this->GetColumnCount(&noOfColumns) == noErr, false,_("Number of columns could not be determined.")); + wxCHECK_MSG(AddColumn(&columnDescription,pos) == noErr, false,_("Column could not be added.")); + wxCHECK_MSG(SetColumnWidth(newPropertyID,columnPtr->GetWidth()) == noErr,false,_("Column width could not be set.")); + wxCHECK_MSG(GetColumnCount(&noOfColumns) == noErr, false,_("Number of columns could not be determined.")); if (noOfColumns == 1) { - wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(this->GetWXPeer())); + wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(GetWXPeer())); wxCHECK_MSG(dataViewCtrlPtr != NULL,false,_("wxWidget's control not initialized.")); dataViewCtrlPtr->AddChildren(wxDataViewItem()); return true; } else - return this->Update(columnPtr); + return Update(columnPtr); } // @@ -921,8 +921,8 @@ bool wxMacDataViewDataBrowserListViewControl::Add(wxDataViewItem const& parent, DataBrowserItemID itemID(reinterpret_cast(item.GetID())); - return (( parent.IsOk() && this->AddItem(reinterpret_cast(parent.GetID()),&itemID) == noErr) || - (!(parent.IsOk()) && this->AddItem(kDataBrowserNoItem,&itemID) == noErr)); + return (( parent.IsOk() && AddItem(reinterpret_cast(parent.GetID()),&itemID) == noErr) || + (!(parent.IsOk()) && AddItem(kDataBrowserNoItem,&itemID) == noErr)); } bool wxMacDataViewDataBrowserListViewControl::Add(wxDataViewItem const& parent, wxDataViewItemArray const& items) @@ -938,8 +938,8 @@ bool wxMacDataViewDataBrowserListViewControl::Add(wxDataViewItem const& parent, itemIDs = ::CreateDataBrowserItemIDArray(noOfEntries,items); // insert all valid items into control: noFailureFlag = ((noOfEntries == 0) || - !(parent.IsOk()) && (this->AddItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr) || - parent.IsOk() && (this->AddItems(reinterpret_cast(parent.GetID()),noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr)); + !(parent.IsOk()) && (AddItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr) || + parent.IsOk() && (AddItems(reinterpret_cast(parent.GetID()),noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr)); // give allocated array space free again: delete[] itemIDs; // done: @@ -948,7 +948,7 @@ bool wxMacDataViewDataBrowserListViewControl::Add(wxDataViewItem const& parent, void wxMacDataViewDataBrowserListViewControl::Collapse(wxDataViewItem const& item) { - this->CloseContainer(reinterpret_cast(item.GetID())); + CloseContainer(reinterpret_cast(item.GetID())); } void wxMacDataViewDataBrowserListViewControl::EnsureVisible(wxDataViewItem const& item, const wxDataViewColumn* columnPtr) @@ -960,20 +960,20 @@ void wxMacDataViewDataBrowserListViewControl::EnsureVisible(wxDataViewItem const propertyID = columnPtr->GetNativeData()->GetPropertyID(); else propertyID = kDataBrowserNoItem; - this->RevealItem(reinterpret_cast(item.GetID()),propertyID,kDataBrowserRevealOnly); + RevealItem(reinterpret_cast(item.GetID()),propertyID,kDataBrowserRevealOnly); } void wxMacDataViewDataBrowserListViewControl::Expand(wxDataViewItem const& item) { - this->OpenContainer(reinterpret_cast(item.GetID())); + OpenContainer(reinterpret_cast(item.GetID())); } -unsigned int wxMacDataViewDataBrowserListViewControl::GetCount(void) const +unsigned int wxMacDataViewDataBrowserListViewControl::GetCount() const { ItemCount noOfItems; - wxCHECK_MSG(this->GetItemCount(&noOfItems) == noErr,0,_("Could not determine number of items")); + wxCHECK_MSG(GetItemCount(&noOfItems) == noErr,0,_("Could not determine number of items")); return noOfItems; } @@ -982,7 +982,7 @@ wxRect wxMacDataViewDataBrowserListViewControl::GetRectangle(wxDataViewItem cons Rect MacRectangle; - if (this->GetPartBounds(reinterpret_cast(item.GetID()),columnPtr->GetNativeData()->GetPropertyID(),kDataBrowserPropertyContentPart,&MacRectangle) == noErr) + if (GetPartBounds(reinterpret_cast(item.GetID()),columnPtr->GetNativeData()->GetPropertyID(),kDataBrowserPropertyContentPart,&MacRectangle) == noErr) { wxRect rectangle; @@ -997,23 +997,23 @@ bool wxMacDataViewDataBrowserListViewControl::IsExpanded(wxDataViewItem const& i { DataBrowserItemState state = 0; - if (this->GetItemState(reinterpret_cast(item.GetID()),&state) != noErr) + if (GetItemState(reinterpret_cast(item.GetID()),&state) != noErr) return false; return ((state & kDataBrowserContainerIsOpen) != 0); } -bool wxMacDataViewDataBrowserListViewControl::Reload(void) +bool wxMacDataViewDataBrowserListViewControl::Reload() { bool noFailureFlag; wxDataViewItemArray dataViewChildren; - noFailureFlag = (this->RemoveItems() == noErr); - this->SetScrollPosition(0,0); // even after having removed all items the scrollbars may remain at their old position -> reset them - this->GetDataViewCtrl()->GetModel()->GetChildren(wxDataViewItem(),dataViewChildren); - this->GetDataViewCtrl()->GetModel()->ItemsAdded(wxDataViewItem(),dataViewChildren); + noFailureFlag = (RemoveItems() == noErr); + SetScrollPosition(0,0); // even after having removed all items the scrollbars may remain at their old position -> reset them + GetDataViewCtrl()->GetModel()->GetChildren(wxDataViewItem(),dataViewChildren); + GetDataViewCtrl()->GetModel()->ItemsAdded(wxDataViewItem(),dataViewChildren); return noFailureFlag; } @@ -1023,7 +1023,7 @@ bool wxMacDataViewDataBrowserListViewControl::Remove(wxDataViewItem const& paren DataBrowserItemID itemID(reinterpret_cast(item.GetID())); - return (this->RemoveItem(reinterpret_cast(parent.GetID()),&itemID) == noErr); + return (RemoveItem(reinterpret_cast(parent.GetID()),&itemID) == noErr); } bool wxMacDataViewDataBrowserListViewControl::Remove(wxDataViewItem const& parent, wxDataViewItemArray const& items) @@ -1039,8 +1039,8 @@ bool wxMacDataViewDataBrowserListViewControl::Remove(wxDataViewItem const& paren itemIDs = ::CreateDataBrowserItemIDArray(noOfEntries,items); // insert all valid items into control: noFailureFlag = ((noOfEntries == 0) || - !(parent.IsOk()) && (this->RemoveItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr) || - parent.IsOk() && (this->RemoveItems(reinterpret_cast(parent.GetID()),noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr)); + !(parent.IsOk()) && (RemoveItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr) || + parent.IsOk() && (RemoveItems(reinterpret_cast(parent.GetID()),noOfEntries,itemIDs,kDataBrowserItemNoProperty) == noErr)); // give allocated array space free again: delete[] itemIDs; // done: @@ -1049,7 +1049,7 @@ bool wxMacDataViewDataBrowserListViewControl::Remove(wxDataViewItem const& paren bool wxMacDataViewDataBrowserListViewControl::Update(wxDataViewColumn const* columnPtr) { - return (this->UpdateItems(kDataBrowserNoItem,0,NULL,kDataBrowserItemNoProperty,columnPtr->GetNativeData()->GetPropertyID()) == noErr); + return (UpdateItems(kDataBrowserNoItem,0,NULL,kDataBrowserItemNoProperty,columnPtr->GetNativeData()->GetPropertyID()) == noErr); } bool wxMacDataViewDataBrowserListViewControl::Update(wxDataViewItem const& parent, wxDataViewItem const& item) @@ -1058,9 +1058,9 @@ bool wxMacDataViewDataBrowserListViewControl::Update(wxDataViewItem const& paren if (parent.IsOk()) - return (this->UpdateItem(reinterpret_cast(parent.GetID()),&itemID) == noErr); + return (UpdateItem(reinterpret_cast(parent.GetID()),&itemID) == noErr); else - return (this->UpdateItem(kDataBrowserNoItem,&itemID) == noErr); + return (UpdateItem(kDataBrowserNoItem,&itemID) == noErr); } bool wxMacDataViewDataBrowserListViewControl::Update(wxDataViewItem const& parent, wxDataViewItemArray const& items) @@ -1075,9 +1075,9 @@ bool wxMacDataViewDataBrowserListViewControl::Update(wxDataViewItem const& paren // convert all valid data view items to data browser items: itemIDs = ::CreateDataBrowserItemIDArray(noOfEntries,items); if (parent.IsOk()) - noFailureFlag = (this->UpdateItems(reinterpret_cast(parent.GetID()),noOfEntries,itemIDs,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty) == noErr); + noFailureFlag = (UpdateItems(reinterpret_cast(parent.GetID()),noOfEntries,itemIDs,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty) == noErr); else - noFailureFlag = (this->UpdateItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty) == noErr); + noFailureFlag = (UpdateItems(kDataBrowserNoItem,noOfEntries,itemIDs,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty) == noErr); // release allocated array space: delete[] itemIDs; // done: @@ -1102,7 +1102,7 @@ int wxMacDataViewDataBrowserListViewControl::GetSelections(wxDataViewItemArray& wxArrayDataBrowserItemID itemIDs; - noOfSelectedItems = this->GetSelectedItemIDs(itemIDs); + noOfSelectedItems = GetSelectedItemIDs(itemIDs); sel.Empty(); sel.SetCount(noOfSelectedItems); for (size_t i=0; iIsItemSelected(reinterpret_cast(item.GetID())); + return IsItemSelected(reinterpret_cast(item.GetID())); } void wxMacDataViewDataBrowserListViewControl::Select(wxDataViewItem const& item) @@ -1120,10 +1120,10 @@ void wxMacDataViewDataBrowserListViewControl::Select(wxDataViewItem const& item) DataBrowserItemID itemID(reinterpret_cast(item.GetID())); - this->SetSelectedItems(1,&itemID,kDataBrowserItemsAdd); + SetSelectedItems(1,&itemID,kDataBrowserItemsAdd); } -void wxMacDataViewDataBrowserListViewControl::SelectAll(void) +void wxMacDataViewDataBrowserListViewControl::SelectAll() { DataBrowserItemID* itemIDPtr; @@ -1132,11 +1132,11 @@ void wxMacDataViewDataBrowserListViewControl::SelectAll(void) size_t noOfItems; - wxCHECK_RET(this->GetItems(kDataBrowserNoItem,true,kDataBrowserItemAnyState,handle) == noErr,_("Could not get items.")); + wxCHECK_RET(GetItems(kDataBrowserNoItem,true,kDataBrowserItemAnyState,handle) == noErr,_("Could not get items.")); noOfItems = static_cast(::GetHandleSize(handle)/sizeof(DataBrowserItemID)); ::HLock(handle); itemIDPtr = (DataBrowserItemID*) (*handle); - this->SetSelectedItems(noOfItems,itemIDPtr,kDataBrowserItemsAssign); + SetSelectedItems(noOfItems,itemIDPtr,kDataBrowserItemsAssign); ::HUnlock(handle); ::DisposeHandle(handle); } @@ -1146,10 +1146,10 @@ void wxMacDataViewDataBrowserListViewControl::Unselect(wxDataViewItem const& ite DataBrowserItemID itemID(reinterpret_cast(item.GetID())); - this->SetSelectedItems(1,&itemID,kDataBrowserItemsRemove); + SetSelectedItems(1,&itemID,kDataBrowserItemsRemove); } -void wxMacDataViewDataBrowserListViewControl::UnselectAll(void) +void wxMacDataViewDataBrowserListViewControl::UnselectAll() { DataBrowserItemID* itemIDPtr; @@ -1158,11 +1158,11 @@ void wxMacDataViewDataBrowserListViewControl::UnselectAll(void) size_t noOfItems; - wxCHECK_RET(this->GetItems(kDataBrowserNoItem,true,kDataBrowserItemAnyState,handle) == noErr,_("Could not get items.")); + wxCHECK_RET(GetItems(kDataBrowserNoItem,true,kDataBrowserItemAnyState,handle) == noErr,_("Could not get items.")); noOfItems = static_cast(::GetHandleSize(handle)/sizeof(DataBrowserItemID)); ::HLock(handle); itemIDPtr = (DataBrowserItemID*) (*handle); - this->SetSelectedItems(noOfItems,itemIDPtr,kDataBrowserItemsRemove); + SetSelectedItems(noOfItems,itemIDPtr,kDataBrowserItemsRemove); ::HUnlock(handle); ::DisposeHandle(handle); } @@ -1170,20 +1170,20 @@ void wxMacDataViewDataBrowserListViewControl::UnselectAll(void) // // sorting related methods // -wxDataViewColumn* wxMacDataViewDataBrowserListViewControl::GetSortingColumn(void) const +wxDataViewColumn* wxMacDataViewDataBrowserListViewControl::GetSortingColumn() const { DataBrowserPropertyID propertyID; - if (this->GetSortProperty(&propertyID) == noErr) - return this->GetColumnPtr(propertyID); + if (GetSortProperty(&propertyID) == noErr) + return GetColumnPtr(propertyID); else return NULL; } -void wxMacDataViewDataBrowserListViewControl::Resort(void) +void wxMacDataViewDataBrowserListViewControl::Resort() { - (void) this->Resort(); + (void) Resort(); } // @@ -1201,27 +1201,27 @@ wxMacDataViewDataBrowserListViewControl::HitTest(const wxPoint& WXUNUSED(point), void wxMacDataViewDataBrowserListViewControl::DoSetIndent(int indent) { - this->SetIndent(static_cast(indent)); + SetIndent(static_cast(indent)); } void wxMacDataViewDataBrowserListViewControl::SetRowHeight(wxDataViewItem const& item, unsigned int height) { - this->SetItemRowHeight(reinterpret_cast(item.GetID()),static_cast(height)); + SetItemRowHeight(reinterpret_cast(item.GetID()),static_cast(height)); } -void wxMacDataViewDataBrowserListViewControl::OnSize(void) +void wxMacDataViewDataBrowserListViewControl::OnSize() { UInt32 noOfColumns; - this->GetColumnCount(&noOfColumns); + GetColumnCount(&noOfColumns); if (noOfColumns <= 1) // no horizontal scroll bar and the only column expands to the width of the whole control { - this->SetHasScrollBars(false,true); - this->AutoSizeColumns(); + SetHasScrollBars(false,true); + AutoSizeColumns(); } else // otherwise keep the current column size and have scrollbars in both directions - this->SetHasScrollBars(true,true); + SetHasScrollBars(true,true); } // @@ -1233,7 +1233,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserCompareProc(DataBrow DataBrowserTableViewColumnIndex modelColumnIndex; - wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(this->GetWXPeer())); + wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(GetWXPeer())); wxCHECK_MSG(dataViewCtrlPtr != NULL, false,_("Pointer to data view control not set correctly.")); @@ -1241,24 +1241,24 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserCompareProc(DataBrow if (sortProperty >= kMinPropertyID) { // variable definition and initialization: - wxDataViewColumn* ColumnPtr(this->GetColumnPtr(sortProperty)); + wxDataViewColumn* ColumnPtr(GetColumnPtr(sortProperty)); wxCHECK_MSG(ColumnPtr != NULL,false,_("Could not determine column index.")); modelColumnIndex = ColumnPtr->GetModelColumn(); } else modelColumnIndex = 0; - this->GetSortOrder(&sortOrder); + GetSortOrder(&sortOrder); return static_cast(dataViewCtrlPtr->GetModel()->Compare(wxDataViewItem(reinterpret_cast(itemOneID)),wxDataViewItem(reinterpret_cast(itemTwoID)), modelColumnIndex,sortOrder != kDataBrowserOrderDecreasing) < 0); -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserCompareProc(DataBrowserItemID, DataBrowserItemID, DataBrowserPropertyID) */ +} void wxMacDataViewDataBrowserListViewControl::DataBrowserGetContextualMenuProc(MenuRef* menu, UInt32* helpType, CFStringRef* helpItemString, AEDesc* WXUNUSED(selection)) // In this method we do not supply a contextual menu handler at all but only send a wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU. { wxArrayDataBrowserItemID itemIDs; - wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(this->GetWXPeer())); + wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(GetWXPeer())); wxCHECK_RET(dataViewCtrlPtr != NULL,_("wxWidget control pointer is not a data view pointer")); @@ -1273,11 +1273,11 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserGetContextualMenuProc(M dataViewEvent.SetModel(dataViewCtrlPtr->GetModel()); // get the item information; // theoretically more than one ID can be returned but the event can only handle one item, therefore all item related data is using the data of the first item in the array: - if (this->GetSelectedItemIDs(itemIDs) > 0) + if (GetSelectedItemIDs(itemIDs) > 0) dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast(itemIDs[0]))); // finally send the equivalent wxWidget event: dataViewCtrlPtr->GetEventHandler()->ProcessEvent(dataViewEvent); -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserGetContextualMenuProc(MenuRef*, UInt32*, CFStringRef*, AEDesc*) */ +} OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemDataRef itemData, Boolean getValue) { @@ -1286,7 +1286,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc( // variable definitions: wxDataViewCtrl* dataViewCtrlPtr; - dataViewCtrlPtr = dynamic_cast(this->GetWXPeer()); + dataViewCtrlPtr = dynamic_cast(GetWXPeer()); wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly.")); if (dataViewCtrlPtr->IsDeleting()) return noErr; // if a delete process is running the data of editable fields cannot be saved because the associated model variable may already have been deleted @@ -1297,7 +1297,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc( wxDataViewColumn* dataViewColumnPtr; wxCHECK_MSG(dataViewCtrlPtr->GetModel() != NULL,errDataBrowserNotConfigured,_("Pointer to model not set correctly.")); - dataViewColumnPtr = this->GetColumnPtr(propertyID); + dataViewColumnPtr = GetColumnPtr(propertyID); wxCHECK_MSG((dataViewColumnPtr != NULL) && (dataViewColumnPtr->GetRenderer() != NULL),errDataBrowserNotConfigured,_("There is no column or renderer for the specified column index.")); wxDataViewItem dvItem(reinterpret_cast(itemID)); @@ -1380,10 +1380,10 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc( wxDataViewColumn* dataViewColumnPtr; wxDataViewCtrl* dataViewCtrlPtr; - dataViewCtrlPtr = dynamic_cast(this->GetWXPeer()); + dataViewCtrlPtr = dynamic_cast(GetWXPeer()); 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.")); - dataViewColumnPtr = this->GetColumnPtr(propertyID); + dataViewColumnPtr = GetColumnPtr(propertyID); wxCHECK_MSG(dataViewColumnPtr != NULL,errDataBrowserNotConfigured,_("No column for the specified column position existing.")); wxCHECK_MSG(dataViewColumnPtr->GetRenderer() != NULL,errDataBrowserNotConfigured,_("No renderer specified for column.")); dataViewCtrlPtr->GetModel()->GetValue(variant,wxDataViewItem(reinterpret_cast(itemID)),dataViewColumnPtr->GetModelColumn()); @@ -1402,7 +1402,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc( case kDataBrowserContainerIsClosableProperty: { // variable definitions: - wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(this->GetWXPeer())); + wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(GetWXPeer())); wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly.")); // initialize wxWidget event: @@ -1419,7 +1419,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc( case kDataBrowserContainerIsOpenableProperty: { // variable definitions: - wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(this->GetWXPeer())); + wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(GetWXPeer())); wxCHECK_MSG(dataViewCtrlPtr != NULL,errDataBrowserNotConfigured,_("Pointer to data view control not set correctly.")); // initialize wxWidget event: @@ -1436,7 +1436,7 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc( case kDataBrowserItemIsContainerProperty: { // variable definition: - wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(this->GetWXPeer())); + wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(GetWXPeer())); 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.")); @@ -1448,11 +1448,11 @@ OSStatus wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc( } } return errDataBrowserPropertyNotSupported; -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc(DataBrowserItemID, DataBrowserPropertyID, DataBrowserItemDataRef, Boolean) */ +} void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(DataBrowserItemID itemID, DataBrowserItemNotification message, DataBrowserItemDataRef itemData) { - wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(this->GetWXPeer())); + wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(GetWXPeer())); // check if the data view control pointer still exists because this call back function can still be called when the control has already been deleted: @@ -1494,14 +1494,14 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da dataViewEvent.SetEventObject(dataViewCtrlPtr); dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast(itemID))); - if (this->GetPropertyID(itemData,&propertyID) == noErr) + if (GetPropertyID(itemData,&propertyID) == noErr) { // variable definition and initialization: DataBrowserTableViewColumnIndex columnIndex; - wxCHECK_RET(this->GetColumnIndex(propertyID,&columnIndex),_("Column index not found.")); + wxCHECK_RET(GetColumnIndex(propertyID,&columnIndex),_("Column index not found.")); dataViewEvent.SetColumn(columnIndex); - dataViewEvent.SetDataViewColumn(this->GetColumnPtr(propertyID)); + dataViewEvent.SetDataViewColumn(GetColumnPtr(propertyID)); } // finally send the equivalent wxWidget event: dataViewCtrlPtr->GetEventHandler()->ProcessEvent(dataViewEvent); @@ -1515,14 +1515,14 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da dataViewEvent.SetEventObject(dataViewCtrlPtr); dataViewEvent.SetItem(wxDataViewItem(reinterpret_cast(itemID))); - if (this->GetPropertyID(itemData,&propertyID) == noErr) + if (GetPropertyID(itemData,&propertyID) == noErr) { // variable definition and initialization: DataBrowserTableViewColumnIndex columnIndex; - wxCHECK_RET(this->GetColumnIndex(propertyID,&columnIndex),_("Column index not found.")); + wxCHECK_RET(GetColumnIndex(propertyID,&columnIndex),_("Column index not found.")); dataViewEvent.SetColumn(columnIndex); - dataViewEvent.SetDataViewColumn(this->GetColumnPtr(propertyID)); + dataViewEvent.SetDataViewColumn(GetColumnPtr(propertyID)); } // finally send the equivalent wxWidget event: dataViewCtrlPtr->GetEventHandler()->ProcessEvent(dataViewEvent); @@ -1575,18 +1575,18 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da // variable definition: UInt16 columnWidth; - wxCHECK_RET(this->GetColumnWidth(columnPtr->GetNativeData()->GetPropertyID(),&columnWidth) == noErr,_("Column width could not be determined")); + wxCHECK_RET(GetColumnWidth(columnPtr->GetNativeData()->GetPropertyID(),&columnWidth) == noErr,_("Column width could not be determined")); columnPtr->SetWidthVariable(columnWidth); } // update sorting orders: DataBrowserPropertyID propertyID; // variable definition - if ((this->GetSortProperty(&propertyID) == noErr) && (propertyID >= kMinPropertyID)) + if ((GetSortProperty(&propertyID) == noErr) && (propertyID >= kMinPropertyID)) { DataBrowserSortOrder sortOrder; DataBrowserTableViewColumnIndex columnIndex; - if ((this->GetSortOrder(&sortOrder) == noErr) && (this->GetColumnIndex(propertyID,&columnIndex) == noErr)) + if ((GetSortOrder(&sortOrder) == noErr) && (GetColumnIndex(propertyID,&columnIndex) == noErr)) { // variable definition and initialization: wxDataViewColumn* columnPtr; @@ -1610,7 +1610,7 @@ void wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(Da } /* block */ break; } -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserItemNotificationProc(DataBrowserItemID, DataBrowserItemNotification, DataBrowserItemDataRef) */ +} void wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID itemID, @@ -1630,11 +1630,11 @@ wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItem wxVariant dataToRender; - dataViewCtrlPtr = dynamic_cast(this->GetWXPeer()); + dataViewCtrlPtr = dynamic_cast(GetWXPeer()); wxCHECK_RET(dataViewCtrlPtr != NULL, _("Pointer to data view control not set correctly.")); wxCHECK_RET(dataViewCtrlPtr->GetModel() != NULL, _("Pointer to model not set correctly.")); - wxCHECK_RET(this->GetColumnIndex(propertyID,&columnIndex) == noErr,_("Could not determine column index.")); - dataViewColumnPtr = this->GetColumnPtr(propertyID); + wxCHECK_RET(GetColumnIndex(propertyID,&columnIndex) == noErr,_("Could not determine column index.")); + dataViewColumnPtr = GetColumnPtr(propertyID); wxCHECK_RET(dataViewColumnPtr != NULL,_("No column for the specified column existing.")); dataViewCustomRendererPtr = dynamic_cast(dataViewColumnPtr->GetRenderer()); wxCHECK_RET(dataViewCustomRendererPtr != NULL,_("No renderer or invalid renderer type specified for custom data column.")); @@ -1656,7 +1656,7 @@ wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItem GetControlBounds(m_controlRef, &content); ::DisposeRgn(rgn); // space for the header - this->GetHeaderButtonHeight(&headerHeight); + GetHeaderButtonHeight(&headerHeight); content.top += headerHeight; // extra space for the frame (todo: do not how to determine the space automatically from the control) content.top += 5; @@ -1680,7 +1680,7 @@ wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItem static_cast(1+rectangle->right-rectangle->left), static_cast(rectangle->bottom-rectangle->top) ); - bool is_active = IsControlActive( this->m_controlRef ); + bool is_active = IsControlActive( m_controlRef ); if (state == kDataBrowserItemIsSelected) { wxColour col( wxMacCreateCGColorFromHITheme( (is_active) ? @@ -1689,7 +1689,7 @@ wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItem wxRect rect = cellrect; Rect itemrect; - GetDataBrowserItemPartBounds( this->m_controlRef, itemID, propertyID, + GetDataBrowserItemPartBounds( m_controlRef, itemID, propertyID, kDataBrowserPropertyEnclosingPart, &itemrect ); rect.x = itemrect.left-2; rect.width = itemrect.right-itemrect.left+3; @@ -1710,7 +1710,7 @@ wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItem } dataViewCustomRendererPtr->SetDC(NULL); -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserDrawItemProc(DataBrowserItemID, DataBrowserPropertyID, DataBrowserItemState, Rect const*, SInt16, Boolean) */ +} Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc( @@ -1721,12 +1721,12 @@ wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc( Boolean* WXUNUSED(shrinkToFit)) { return false; -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserEditItemProc(DataBrowserItemID, DataBrowserPropertyID, CFStringRef, Rect*, Boolean*) */ +} Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserHitTestProc(DataBrowserItemID WXUNUSED(itemID), DataBrowserPropertyID WXUNUSED(property), Rect const* WXUNUSED(theRect), Rect const* WXUNUSED(mouseRect)) { return true; -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserHitTestProc(DataBrowserItemID, DataBrowserPropertyID, Rect const*, Rect const*) */ +} DataBrowserTrackingResult wxMacDataViewDataBrowserListViewControl::DataBrowserTrackingProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, Rect const* theRect, Point WXUNUSED(startPt), EventModifiers WXUNUSED(modifiers)) { @@ -1739,12 +1739,12 @@ DataBrowserTrackingResult wxMacDataViewDataBrowserListViewControl::DataBrowserTr wxDataViewItem dataViewCustomRendererItem; - dataViewCtrlPtr = dynamic_cast(this->GetWXPeer()); + dataViewCtrlPtr = dynamic_cast(GetWXPeer()); 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.")); dataViewCustomRendererItem = reinterpret_cast(itemID); wxCHECK_MSG(dataViewCustomRendererItem.IsOk(),kDataBrowserNothingHit,_("Invalid data view item")); - dataViewColumnPtr = this->GetColumnPtr(propertyID); + dataViewColumnPtr = GetColumnPtr(propertyID); wxCHECK_MSG(dataViewColumnPtr != NULL,kDataBrowserNothingHit,_("No column existing.")); dataViewCustomRendererPtr = dynamic_cast(dataViewColumnPtr->GetRenderer()); wxCHECK_MSG(dataViewCustomRendererPtr != NULL,kDataBrowserNothingHit,_("No renderer or invalid renderer type specified for custom data column.")); @@ -1770,7 +1770,7 @@ DataBrowserTrackingResult wxMacDataViewDataBrowserListViewControl::DataBrowserTr dataViewCtrlPtr->SetCustomRendererPtr (dataViewCustomRendererPtr); } return kDataBrowserContentHit; -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserTrackingProc(DataBrowserItemID, DataBrowserPropertyID, Rect const*, Point, EventModifiers) */ +} Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAcceptDragProc(DragReference dragRef, DataBrowserItemID itemID) { @@ -1781,7 +1781,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAcceptDragProc(DragR wxDataViewCtrl* dataViewCtrlPtr; - dataViewCtrlPtr = dynamic_cast(this->GetWXPeer()); + dataViewCtrlPtr = dynamic_cast(GetWXPeer()); 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.")); @@ -1795,7 +1795,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAcceptDragProc(DragR wxMemoryBuffer buffer; ::GetDragItemReferenceNumber(dragRef,indexDraggedItem,&itemRef); // the index begins with 1! - dataObjects = this->GetDnDDataObjects(dragRef,itemRef); + dataObjects = GetDnDDataObjects(dragRef,itemRef); // create wxWidget's event: wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_DROP_POSSIBLE,dataViewCtrlPtr->GetId()); @@ -1804,7 +1804,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAcceptDragProc(DragR // (can be an invalid item ID, this is especially useful if the dataview does not contain any items) dataViewEvent.SetModel(dataViewCtrlPtr->GetModel()); dataViewEvent.SetDataObject(dataObjects); - dataViewEvent.SetDataFormat(this->GetDnDDataFormat(dataObjects)); + dataViewEvent.SetDataFormat(GetDnDDataFormat(dataObjects)); if (dataViewEvent.GetDataFormat().GetType() != wxDF_INVALID) { dataViewEvent.SetDataSize(dataObjects->GetDataSize(dataViewEvent.GetDataFormat().GetType())); @@ -1820,7 +1820,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAcceptDragProc(DragR return false; } return true; -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserAcceptDragProc(DragReference, DataBrowserItemID) */ +} Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAddDragItemProc(DragReference dragRef, DataBrowserItemID itemID, ItemReference* itemRef) { @@ -1831,7 +1831,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAddDragItemProc(Drag wxDataViewItem dataViewItem; - dataViewCtrlPtr = dynamic_cast(this->GetWXPeer()); + dataViewCtrlPtr = dynamic_cast(GetWXPeer()); 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.")); dataViewItem = reinterpret_cast(itemID); @@ -1945,7 +1945,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserAddDragItemProc(Drag // clean-up and return result: delete dataObject; return addDragItem; -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserAddDragItemProc(DragReference, DataBrowserItemID, ItemReference*) */ +} Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserReceiveDragProc(DragReference dragRef, DataBrowserItemID itemID) { @@ -1954,7 +1954,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserReceiveDragProc(Drag wxDataViewCtrl* dataViewCtrlPtr; - dataViewCtrlPtr = dynamic_cast(this->GetWXPeer()); + dataViewCtrlPtr = dynamic_cast(GetWXPeer()); 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.")); @@ -1969,7 +1969,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserReceiveDragProc(Drag // collect native information: ::GetDragItemReferenceNumber(dragRef,indexDraggedItem,&itemRef); // the index begins with 1! - dataObjects = this->GetDnDDataObjects(dragRef,itemRef); + dataObjects = GetDnDDataObjects(dragRef,itemRef); // create wxWidget's event: wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_DROP,dataViewCtrlPtr->GetId()); @@ -1978,7 +1978,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserReceiveDragProc(Drag // (can be an invalid item ID, this is especially useful if the dataview does not contain any items) dataViewEvent.SetModel(dataViewCtrlPtr->GetModel()); dataViewEvent.SetDataObject(dataObjects); - dataViewEvent.SetDataFormat(this->GetDnDDataFormat(dataObjects)); + dataViewEvent.SetDataFormat(GetDnDDataFormat(dataObjects)); if (dataViewEvent.GetDataFormat().GetType() != wxDF_INVALID) { dataViewEvent.SetDataSize(dataObjects->GetDataSize(dataViewEvent.GetDataFormat().GetType())); @@ -1994,7 +1994,7 @@ Boolean wxMacDataViewDataBrowserListViewControl::DataBrowserReceiveDragProc(Drag return false; } return true; -} /* wxMacDataViewDataBrowserListViewControl::DataBrowserReceiveDragProc(DragReference, DataBrowserItemID) */ +} // // drag & drop helper methods @@ -2055,7 +2055,7 @@ wxDataFormat wxMacDataViewDataBrowserListViewControl::GetDnDDataFormat(wxDataObj else resultFormat = wxDF_INVALID; return resultFormat; -} /* wxMacDataViewDataBrowserListViewControl::GetDnDDataFormat(wxDataObjectComposite*) */ +} wxDataObjectComposite* wxMacDataViewDataBrowserListViewControl::GetDnDDataObjects(DragReference dragRef, ItemReference itemRef) const { @@ -2148,14 +2148,14 @@ wxDataObjectComposite* wxMacDataViewDataBrowserListViewControl::GetDnDDataObject else dataObject = NULL; return dataObject; -} /* wxMacDataViewDataBrowserListViewControl::GetDnDDataObjects(DragReference, ItemReference) const */ +} // // other methods // wxDataViewColumn* wxMacDataViewDataBrowserListViewControl::GetColumnPtr(DataBrowserPropertyID propertyID) const { - wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(this->GetWXPeer())); + wxDataViewCtrl* dataViewCtrlPtr(dynamic_cast(GetWXPeer())); if (dataViewCtrlPtr != NULL) { @@ -2176,14 +2176,14 @@ wxDataViewRenderer::wxDataViewRenderer(wxString const& varianttype, wxDataViewCe { } -wxDataViewRenderer::~wxDataViewRenderer(void) +wxDataViewRenderer::~wxDataViewRenderer() { - delete this->m_NativeDataPtr; + delete m_NativeDataPtr; } void wxDataViewRenderer::SetAlignment(int align) { - this->m_alignment = align; + m_alignment = align; } void wxDataViewRenderer::SetMode(wxDataViewCellMode mode) @@ -2192,7 +2192,7 @@ void wxDataViewRenderer::SetMode(wxDataViewCellMode mode) m_mode = mode; - dataViewColumnPtr = this->GetOwner(); + dataViewColumnPtr = GetOwner(); if (dataViewColumnPtr != NULL) { wxDataViewCtrl* dataViewCtrlPtr(dataViewColumnPtr->GetOwner()); @@ -2219,8 +2219,8 @@ void wxDataViewRenderer::SetMode(wxDataViewCellMode mode) void wxDataViewRenderer::SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr) { - delete this->m_NativeDataPtr; - this->m_NativeDataPtr = newNativeDataPtr; + delete m_NativeDataPtr; + m_NativeDataPtr = newNativeDataPtr; } IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer,wxDataViewRendererBase) @@ -2231,7 +2231,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer,wxDataViewRendererBase) wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align) :wxDataViewRenderer(varianttype,mode,align), m_editorCtrlPtr(NULL), m_DCPtr(NULL) { - this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserCustomType)); + SetNativeData(new wxDataViewRendererNativeData(kDataBrowserCustomType)); } bool wxDataViewCustomRenderer::MacRender() @@ -2247,15 +2247,15 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) wxDataViewTextRenderer::wxDataViewTextRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align) :wxDataViewRenderer(varianttype,mode,align) { - this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserTextType)); + SetNativeData(new wxDataViewRendererNativeData(kDataBrowserTextType)); } bool wxDataViewTextRenderer::MacRender() { - wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Text renderer cannot render value; value type: ")) << this->GetValue().GetType()); + wxCHECK_MSG(GetValue().GetType() == GetVariantType(),false,wxString(_("Text renderer cannot render value; value type: ")) << GetValue().GetType()); - wxCFStringRef cfString(this->GetValue().GetString(),(this->GetView()->GetFont().Ok() ? this->GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); - return (::SetDataBrowserItemDataText(this->GetNativeData()->GetItemDataRef(),cfString) == noErr); + wxCFStringRef cfString(GetValue().GetString(),(GetView()->GetFont().Ok() ? GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); + return (::SetDataBrowserItemDataText(GetNativeData()->GetItemDataRef(),cfString) == noErr); } IMPLEMENT_CLASS(wxDataViewTextRenderer,wxDataViewRenderer) @@ -2266,7 +2266,7 @@ IMPLEMENT_CLASS(wxDataViewTextRenderer,wxDataViewRenderer) wxDataViewBitmapRenderer::wxDataViewBitmapRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align) :wxDataViewRenderer(varianttype,mode,align) { - this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserIconType)); + SetNativeData(new wxDataViewRendererNativeData(kDataBrowserIconType)); } bool wxDataViewBitmapRenderer::MacRender() @@ -2275,12 +2275,12 @@ bool wxDataViewBitmapRenderer::MacRender() // - the passed bitmap is invalid (or is not initialized); this case simulates a non-existing bitmap. // In all other cases the method returns 'false'. { - wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Bitmap renderer cannot render value; value type: ")) << this->GetValue().GetType()); + wxCHECK_MSG(GetValue().GetType() == GetVariantType(),false,wxString(_("Bitmap renderer cannot render value; value type: ")) << GetValue().GetType()); wxBitmap bitmap; - bitmap << this->GetValue(); - return (!(bitmap.Ok()) || (::SetDataBrowserItemDataIcon(this->GetNativeData()->GetItemDataRef(),bitmap.GetIconRef()) == noErr)); + bitmap << GetValue(); + return (!(bitmap.Ok()) || (::SetDataBrowserItemDataIcon(GetNativeData()->GetItemDataRef(),bitmap.GetIconRef()) == noErr)); } IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer) @@ -2294,23 +2294,23 @@ wxDataViewIconTextRenderer::wxDataViewIconTextRenderer( int WXUNUSED(align)) :wxDataViewRenderer(varianttype,mode) { - this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserIconAndTextType)); + SetNativeData(new wxDataViewRendererNativeData(kDataBrowserIconAndTextType)); } 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(GetValue().GetType() == GetVariantType(),false,wxString(_("Icon & text renderer cannot render value; value type: ")) << GetValue().GetType()); wxDataViewIconText iconText; - iconText << this->GetValue(); + iconText << GetValue(); - wxCFStringRef cfString(iconText.GetText(),(this->GetView()->GetFont().Ok() ? this->GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); + wxCFStringRef cfString(iconText.GetText(),(GetView()->GetFont().Ok() ? GetView()->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); if (iconText.GetIcon().IsOk()) - if (::SetDataBrowserItemDataIcon(this->GetNativeData()->GetItemDataRef(),MAC_WXHICON(iconText.GetIcon().GetHICON())) != noErr) + if (::SetDataBrowserItemDataIcon(GetNativeData()->GetItemDataRef(),MAC_WXHICON(iconText.GetIcon().GetHICON())) != noErr) return false; - return (::SetDataBrowserItemDataText(this->GetNativeData()->GetItemDataRef(),cfString) == noErr); + return (::SetDataBrowserItemDataText(GetNativeData()->GetItemDataRef(),cfString) == noErr); } IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer) @@ -2325,13 +2325,13 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer( int WXUNUSED(align)) :wxDataViewRenderer(varianttype,mode) { - this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserCheckboxType)); + SetNativeData(new wxDataViewRendererNativeData(kDataBrowserCheckboxType)); } bool wxDataViewToggleRenderer::MacRender() { - 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); + wxCHECK_MSG(GetValue().GetType() == GetVariantType(),false,wxString(_("Toggle renderer cannot render value; value type: ")) << GetValue().GetType()); + return (::SetDataBrowserItemDataButtonValue(GetNativeData()->GetItemDataRef(),GetValue().GetBool()) == noErr); } IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer) @@ -2346,15 +2346,15 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer( int align) :wxDataViewRenderer(varianttype,mode,align) { - this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserProgressBarType)); + SetNativeData(new wxDataViewRendererNativeData(kDataBrowserProgressBarType)); } bool wxDataViewProgressRenderer::MacRender() { - 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) && - (::SetDataBrowserItemDataMaximum(this->GetNativeData()->GetItemDataRef(),100) == noErr) && - (::SetDataBrowserItemDataValue (this->GetNativeData()->GetItemDataRef(),this->GetValue().GetLong()) == noErr)); + wxCHECK_MSG(GetValue().GetType() == GetVariantType(),false,wxString(_("Progress renderer cannot render value type; value type: ")) << GetValue().GetType()); + return ((::SetDataBrowserItemDataMinimum(GetNativeData()->GetItemDataRef(), 0) == noErr) && + (::SetDataBrowserItemDataMaximum(GetNativeData()->GetItemDataRef(),100) == noErr) && + (::SetDataBrowserItemDataValue (GetNativeData()->GetItemDataRef(),GetValue().GetLong()) == noErr)); } IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer,wxDataViewRenderer) @@ -2365,13 +2365,13 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer,wxDataViewRenderer) wxDataViewDateRenderer::wxDataViewDateRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align) :wxDataViewRenderer(varianttype,mode,align) { - this->SetNativeData(new wxDataViewRendererNativeData(kDataBrowserDateTimeType)); + SetNativeData(new wxDataViewRendererNativeData(kDataBrowserDateTimeType)); } bool wxDataViewDateRenderer::MacRender() { - 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); + wxCHECK_MSG(GetValue().GetType() == GetVariantType(),false,wxString(_("Date renderer cannot render value; value type: ")) << GetValue().GetType()); + return (::SetDataBrowserItemDataDateTime(GetNativeData()->GetItemDataRef(),GetValue().GetDateTime().Subtract(wxDateTime(1,wxDateTime::Jan,1904)).GetSeconds().GetLo()) == noErr); } IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer,wxDataViewRenderer) @@ -2382,7 +2382,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer,wxDataViewRenderer) wxDataViewColumn::wxDataViewColumn(const wxString& title, wxDataViewRenderer* renderer, unsigned int model_column, int width, wxAlignment align, int flags) :wxDataViewColumnBase(renderer, model_column), m_NativeDataPtr(new wxDataViewColumnNativeData()), m_title(title) { - this->InitCommon(width, align, flags); + InitCommon(width, align, flags); if ((renderer != NULL) && (renderer->GetAlignment() == wxDVR_DEFAULT_ALIGNMENT)) renderer->SetAlignment(align); } @@ -2390,14 +2390,14 @@ wxDataViewColumn::wxDataViewColumn(const wxString& title, wxDataViewRenderer* re wxDataViewColumn::wxDataViewColumn(const wxBitmap& bitmap, wxDataViewRenderer* renderer, unsigned int model_column, int width, wxAlignment align, int flags) :wxDataViewColumnBase(bitmap, renderer, model_column), m_NativeDataPtr(new wxDataViewColumnNativeData()) { - this->InitCommon(width, align, flags); + InitCommon(width, align, flags); if ((renderer != NULL) && (renderer->GetAlignment() == wxDVR_DEFAULT_ALIGNMENT)) renderer->SetAlignment(align); } -wxDataViewColumn::~wxDataViewColumn(void) +wxDataViewColumn::~wxDataViewColumn() { - delete this->m_NativeDataPtr; + delete m_NativeDataPtr; } bool wxDataViewColumn::IsSortKey() const @@ -2409,12 +2409,12 @@ bool wxDataViewColumn::IsSortKey() const DataBrowserPropertyID propertyID; return (macDataViewListCtrlPtr->GetSortProperty(&propertyID) == noErr) && - (propertyID == this->GetNativeData()->GetPropertyID()); + (propertyID == GetNativeData()->GetPropertyID()); } void wxDataViewColumn::SetAlignment(wxAlignment align) { - wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); + wxDataViewCtrl* dataViewCtrlPtr(GetOwner()); m_alignment = align; @@ -2426,7 +2426,7 @@ void wxDataViewColumn::SetAlignment(wxAlignment align) { DataBrowserListViewHeaderDesc headerDescription; - wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); + wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); switch (align) { case wxALIGN_CENTER: @@ -2442,14 +2442,14 @@ void wxDataViewColumn::SetAlignment(wxAlignment align) default: headerDescription.btnFontStyle.just = teFlushDefault; } - wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not set alignment.")); + wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not set alignment.")); } } } void wxDataViewColumn::SetBitmap(wxBitmap const& bitmap) { - wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); + wxDataViewCtrl* dataViewCtrlPtr(GetOwner()); wxDataViewColumnBase::SetBitmap(bitmap); @@ -2461,19 +2461,19 @@ void wxDataViewColumn::SetBitmap(wxBitmap const& bitmap) { DataBrowserListViewHeaderDesc headerDescription; - wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); - if (this->GetBitmap().Ok()) - headerDescription.btnContentInfo.u.iconRef = this->GetBitmap().GetIconRef(); + wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); + if (GetBitmap().Ok()) + headerDescription.btnContentInfo.u.iconRef = GetBitmap().GetIconRef(); else headerDescription.btnContentInfo.u.iconRef = NULL; - wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not set icon.")); + wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not set icon.")); } } } void wxDataViewColumn::SetMaxWidth(int maxWidth) { - wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); + wxDataViewCtrl* dataViewCtrlPtr(GetOwner()); m_maxWidth = maxWidth; @@ -2485,16 +2485,16 @@ void wxDataViewColumn::SetMaxWidth(int maxWidth) { DataBrowserListViewHeaderDesc headerDescription; - wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); + wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); headerDescription.maximumWidth = static_cast(maxWidth); - wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not set maximum width.")); + wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not set maximum width.")); } } } void wxDataViewColumn::SetMinWidth(int minWidth) { - wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); + wxDataViewCtrl* dataViewCtrlPtr(GetOwner()); m_minWidth = minWidth; @@ -2506,9 +2506,9 @@ void wxDataViewColumn::SetMinWidth(int minWidth) { DataBrowserListViewHeaderDesc headerDescription; - wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); + wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); headerDescription.minimumWidth = static_cast(minWidth); - wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not set minimum width.")); + wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not set minimum width.")); } } } @@ -2521,7 +2521,7 @@ void wxDataViewColumn::SetReorderable(bool reorderable) else m_flags &= ~wxDATAVIEW_COL_REORDERABLE; // if the column is associated with a control change also immediately the flags of the control: - wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); + wxDataViewCtrl* dataViewCtrlPtr(GetOwner()); if (dataViewCtrlPtr != NULL) { @@ -2529,12 +2529,12 @@ void wxDataViewColumn::SetReorderable(bool reorderable) wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast(dataViewCtrlPtr->GetPeer())); wxCHECK_RET(macDataViewListCtrlPtr != NULL, _("Valid pointer to native data view control does not exist")); - wxCHECK_RET(macDataViewListCtrlPtr->GetPropertyFlags(this->GetNativeData()->GetPropertyID(),&flags) == noErr,_("Could not get property flags.")); + wxCHECK_RET(macDataViewListCtrlPtr->GetPropertyFlags(GetNativeData()->GetPropertyID(),&flags) == noErr,_("Could not get property flags.")); if (reorderable) flags |= kDataBrowserListViewMovableColumn; else flags &= ~kDataBrowserListViewMovableColumn; - wxCHECK_RET(macDataViewListCtrlPtr->SetPropertyFlags(this->GetNativeData()->GetPropertyID(),flags) == noErr,_("Could not set property flags.")); + wxCHECK_RET(macDataViewListCtrlPtr->SetPropertyFlags(GetNativeData()->GetPropertyID(),flags) == noErr,_("Could not set property flags.")); } } @@ -2546,7 +2546,7 @@ void wxDataViewColumn::SetResizeable(bool resizeable) else m_flags &= ~wxDATAVIEW_COL_RESIZABLE; // if the column is associated with a control change also immediately the flags of the control: - wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); + wxDataViewCtrl* dataViewCtrlPtr(GetOwner()); if (dataViewCtrlPtr != NULL) { @@ -2556,24 +2556,24 @@ void wxDataViewColumn::SetResizeable(bool resizeable) { DataBrowserListViewHeaderDesc headerDescription; - verify_noerr(macDataViewListCtrlPtr->GetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription)); + verify_noerr(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription)); if (resizeable) { - if (this->GetMinWidth() >= this->GetMaxWidth()) + if (GetMinWidth() >= GetMaxWidth()) { - this->m_minWidth = 0; - this->m_maxWidth = 30000; + m_minWidth = 0; + m_maxWidth = 30000; } - headerDescription.minimumWidth = this->m_minWidth; - headerDescription.maximumWidth = this->m_maxWidth; + headerDescription.minimumWidth = m_minWidth; + headerDescription.maximumWidth = m_maxWidth; } else { - headerDescription.minimumWidth = this->m_width; - headerDescription.maximumWidth = this->m_width; + headerDescription.minimumWidth = m_width; + headerDescription.maximumWidth = m_width; } - verify_noerr(macDataViewListCtrlPtr->SetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription)); - macDataViewListCtrlPtr->SetSortProperty(this->GetNativeData()->GetPropertyID()); + verify_noerr(macDataViewListCtrlPtr->SetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription)); + macDataViewListCtrlPtr->SetSortProperty(GetNativeData()->GetPropertyID()); } } } @@ -2586,7 +2586,7 @@ void wxDataViewColumn::SetSortable(bool sortable) else m_flags &= ~wxDATAVIEW_COL_SORTABLE; // if the column is associated with a control change also immediately the flags of the control: - wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); + wxDataViewCtrl* dataViewCtrlPtr(GetOwner()); if (dataViewCtrlPtr != NULL) { @@ -2594,18 +2594,18 @@ void wxDataViewColumn::SetSortable(bool sortable) wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast(dataViewCtrlPtr->GetPeer())); wxCHECK_RET(macDataViewListCtrlPtr != NULL, _("Valid pointer to native data view control does not exist")); - wxCHECK_RET(macDataViewListCtrlPtr->GetPropertyFlags(this->GetNativeData()->GetPropertyID(),&flags) == noErr,_("Could not get property flags.")); + wxCHECK_RET(macDataViewListCtrlPtr->GetPropertyFlags(GetNativeData()->GetPropertyID(),&flags) == noErr,_("Could not get property flags.")); if (sortable) flags |= kDataBrowserListViewSortableColumn; else flags &= ~kDataBrowserListViewSortableColumn; - wxCHECK_RET(macDataViewListCtrlPtr->SetPropertyFlags(this->GetNativeData()->GetPropertyID(),flags) == noErr,_("Could not set property flags.")); + wxCHECK_RET(macDataViewListCtrlPtr->SetPropertyFlags(GetNativeData()->GetPropertyID(),flags) == noErr,_("Could not set property flags.")); } } void wxDataViewColumn::SetSortOrder(bool ascending) { - wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); + wxDataViewCtrl* dataViewCtrlPtr(GetOwner()); m_ascending = ascending; @@ -2617,20 +2617,20 @@ void wxDataViewColumn::SetSortOrder(bool ascending) { DataBrowserListViewHeaderDesc headerDescription; - verify_noerr(macDataViewListCtrlPtr->GetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription)); + verify_noerr(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription)); if (ascending) headerDescription.initialOrder = kDataBrowserOrderIncreasing; else headerDescription.initialOrder = kDataBrowserOrderDecreasing; - verify_noerr(macDataViewListCtrlPtr->SetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription)); - macDataViewListCtrlPtr->SetSortProperty(this->GetNativeData()->GetPropertyID()); + verify_noerr(macDataViewListCtrlPtr->SetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription)); + macDataViewListCtrlPtr->SetSortProperty(GetNativeData()->GetPropertyID()); } } } void wxDataViewColumn::SetTitle(wxString const& title) { - wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); + wxDataViewCtrl* dataViewCtrlPtr(GetOwner()); m_title = title; @@ -2643,16 +2643,16 @@ void wxDataViewColumn::SetTitle(wxString const& title) DataBrowserListViewHeaderDesc headerDescription; wxCFStringRef cfTitle(title,(dataViewCtrlPtr->GetFont().Ok() ? dataViewCtrlPtr->GetFont().GetEncoding() : wxLocale::GetSystemEncoding())); - wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); + wxCHECK_RET(macDataViewListCtrlPtr->GetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not get header description.")); headerDescription.titleString = cfTitle; - wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(this->GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not set header description.")); + wxCHECK_RET(macDataViewListCtrlPtr->SetHeaderDesc(GetNativeData()->GetPropertyID(),&headerDescription) == noErr,_("Could not set header description.")); } } } void wxDataViewColumn::SetWidth(int width) { - wxDataViewCtrl* dataViewCtrlPtr(this->GetOwner()); + wxDataViewCtrl* dataViewCtrlPtr(GetOwner()); if ((width >= m_minWidth) && (width <= m_maxWidth)) @@ -2663,7 +2663,7 @@ void wxDataViewColumn::SetWidth(int width) wxMacDataViewDataBrowserListViewControlPointer macDataViewListCtrlPtr(dynamic_cast(dataViewCtrlPtr->GetPeer())); if (macDataViewListCtrlPtr != NULL) - wxCHECK_RET(macDataViewListCtrlPtr->SetColumnWidth(this->GetNativeData()->GetPropertyID(),static_cast(width)) == noErr,_("Could not set column width.")); + wxCHECK_RET(macDataViewListCtrlPtr->SetColumnWidth(GetNativeData()->GetPropertyID(),static_cast(width)) == noErr,_("Could not set column width.")); } } } @@ -2676,8 +2676,8 @@ void wxDataViewColumn::SetAsSortKey(bool WXUNUSED(sort)) void wxDataViewColumn::SetNativeData(wxDataViewColumnNativeData* newNativeDataPtr) { - delete this->m_NativeDataPtr; - this->m_NativeDataPtr = newNativeDataPtr; + delete m_NativeDataPtr; + m_NativeDataPtr = newNativeDataPtr; } #endif // wxUSE_DATAVIEWCTRL && !wxUSE_GENERICDATAVIEWCTRL diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm index fe913b7039..7e536000f5 100644 --- a/src/osx/cocoa/dataview.mm +++ b/src/osx/cocoa/dataview.mm @@ -1020,7 +1020,7 @@ wxWidgetImplType* CreateDataView(wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(pare customRendererObject->customRenderer->LeftClick(wxFromNSPoint(controlView,point),wxFromNSRect(controlView,cellFrame), customRendererObject->GetOwner()->GetOwner(),wxDataViewItem([customRendererObject->item pointer]), - [this->m_OutlineView columnWithIdentifier:[customRendererObject->GetColumnPtr() identifier]]); + [m_OutlineView columnWithIdentifier:[customRendererObject->GetColumnPtr() identifier]]); return NSCellHitContentArea; } #endif @@ -1643,7 +1643,7 @@ wxCocoaDataViewControl::wxCocoaDataViewControl(wxWindow* peer, wxPoint const& po m_DataSource(NULL), m_OutlineView([[wxCocoaOutlineView alloc] init]) { // initialize scrollview (the outline view is part of a scrollview): - NSScrollView* scrollview = (NSScrollView*) this->GetWXWidget(); // definition for abbreviational purposes + NSScrollView* scrollview = (NSScrollView*) GetWXWidget(); // definition for abbreviational purposes [scrollview setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; @@ -1651,76 +1651,76 @@ wxCocoaDataViewControl::wxCocoaDataViewControl(wxWindow* peer, wxPoint const& po [scrollview setHasVerticalScroller:YES]; [scrollview setHasHorizontalScroller:YES]; [scrollview setAutohidesScrollers:YES]; - [scrollview setDocumentView:this->m_OutlineView]; + [scrollview setDocumentView:m_OutlineView]; // setting up the native control itself NSUInteger maskGridStyle(NSTableViewGridNone); - [this->m_OutlineView setImplementation:this]; - [this->m_OutlineView setColumnAutoresizingStyle:NSTableViewSequentialColumnAutoresizingStyle]; - [this->m_OutlineView setIndentationPerLevel:this->GetDataViewCtrl()->GetIndent()]; + [m_OutlineView setImplementation:this]; + [m_OutlineView setColumnAutoresizingStyle:NSTableViewSequentialColumnAutoresizingStyle]; + [m_OutlineView setIndentationPerLevel:GetDataViewCtrl()->GetIndent()]; if (style & wxDV_HORIZ_RULES) maskGridStyle |= NSTableViewSolidHorizontalGridLineMask; if (style & wxDV_VERT_RULES) maskGridStyle |= NSTableViewSolidVerticalGridLineMask; - [this->m_OutlineView setGridStyleMask:maskGridStyle]; - [this->m_OutlineView setAllowsMultipleSelection: (style & wxDV_MULTIPLE) != 0]; - [this->m_OutlineView setUsesAlternatingRowBackgroundColors:(style & wxDV_ROW_LINES) != 0]; + [m_OutlineView setGridStyleMask:maskGridStyle]; + [m_OutlineView setAllowsMultipleSelection: (style & wxDV_MULTIPLE) != 0]; + [m_OutlineView setUsesAlternatingRowBackgroundColors:(style & wxDV_ROW_LINES) != 0]; } -wxCocoaDataViewControl::~wxCocoaDataViewControl(void) +wxCocoaDataViewControl::~wxCocoaDataViewControl() { - [this->m_DataSource release]; - [this->m_OutlineView release]; + [m_DataSource release]; + [m_OutlineView release]; } // // column related methods (inherited from wxDataViewWidgetImpl) // -bool wxCocoaDataViewControl::ClearColumns(void) +bool wxCocoaDataViewControl::ClearColumns() { - bool const bufAllowsMultipleSelection = [this->m_OutlineView allowsMultipleSelection]; + bool const bufAllowsMultipleSelection = [m_OutlineView allowsMultipleSelection]; // as there is a bug in NSOutlineView version (OSX 10.5.6 #6555162) the columns cannot be deleted if there is an outline column in the view; // therefore, the whole view is deleted and newly constructed: - [this->m_OutlineView release]; - this->m_OutlineView = [[wxCocoaOutlineView alloc] init]; - [((NSScrollView*) this->GetWXWidget()) setDocumentView:this->m_OutlineView]; + [m_OutlineView release]; + m_OutlineView = [[wxCocoaOutlineView alloc] init]; + [((NSScrollView*) GetWXWidget()) setDocumentView:m_OutlineView]; // setting up the native control itself - [this->m_OutlineView setImplementation:this]; - [this->m_OutlineView setColumnAutoresizingStyle:NSTableViewSequentialColumnAutoresizingStyle]; - [this->m_OutlineView setIndentationPerLevel:this->GetDataViewCtrl()->GetIndent()]; + [m_OutlineView setImplementation:this]; + [m_OutlineView setColumnAutoresizingStyle:NSTableViewSequentialColumnAutoresizingStyle]; + [m_OutlineView setIndentationPerLevel:GetDataViewCtrl()->GetIndent()]; if (bufAllowsMultipleSelection) - [this->m_OutlineView setAllowsMultipleSelection:YES]; - [this->m_OutlineView setDataSource:this->m_DataSource]; + [m_OutlineView setAllowsMultipleSelection:YES]; + [m_OutlineView setDataSource:m_DataSource]; // done: return true; } bool wxCocoaDataViewControl::DeleteColumn(wxDataViewColumn* columnPtr) { - if ([this->m_OutlineView outlineTableColumn] == columnPtr->GetNativeData()->GetNativeColumnPtr()) - [this->m_OutlineView setOutlineTableColumn:nil]; // due to a bug this does not work - [this->m_OutlineView removeTableColumn:columnPtr->GetNativeData()->GetNativeColumnPtr()]; // due to a confirmed bug #6555162 the deletion does not work for + if ([m_OutlineView outlineTableColumn] == columnPtr->GetNativeData()->GetNativeColumnPtr()) + [m_OutlineView setOutlineTableColumn:nil]; // due to a bug this does not work + [m_OutlineView removeTableColumn:columnPtr->GetNativeData()->GetNativeColumnPtr()]; // due to a confirmed bug #6555162 the deletion does not work for // outline table columns (... and there is no workaround) - return (([this->m_OutlineView columnWithIdentifier:[[[wxPointerObject alloc] initWithPointer:columnPtr] autorelease]]) == -1); + return (([m_OutlineView columnWithIdentifier:[[[wxPointerObject alloc] initWithPointer:columnPtr] autorelease]]) == -1); } void wxCocoaDataViewControl::DoSetExpanderColumn(wxDataViewColumn const* columnPtr) { - [this->m_OutlineView setOutlineTableColumn:columnPtr->GetNativeData()->GetNativeColumnPtr()]; + [m_OutlineView setOutlineTableColumn:columnPtr->GetNativeData()->GetNativeColumnPtr()]; } wxDataViewColumn* wxCocoaDataViewControl::GetColumn(unsigned int pos) const { - return reinterpret_cast([[[[this->m_OutlineView tableColumns] objectAtIndex:pos] identifier] pointer]); + return reinterpret_cast([[[[m_OutlineView tableColumns] objectAtIndex:pos] identifier] pointer]); } int wxCocoaDataViewControl::GetColumnPosition(wxDataViewColumn const* columnPtr) const { - return [this->m_OutlineView columnWithIdentifier:[[[wxPointerObject alloc] initWithPointer:const_cast(columnPtr)] autorelease]]; + return [m_OutlineView columnWithIdentifier:[[[wxPointerObject alloc] initWithPointer:const_cast(columnPtr)] autorelease]]; } bool wxCocoaDataViewControl::InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr) @@ -1733,9 +1733,9 @@ bool wxCocoaDataViewControl::InsertColumn(unsigned int pos, wxDataViewColumn* co columnPtr->GetNativeData()->SetNativeColumnPtr(nativeColumn); // as the native control does not allow the insertion of a column at a specified position the column is first appended and // - if necessary - moved to its final position: - [this->m_OutlineView addTableColumn:nativeColumn]; - if (pos != static_cast([this->m_OutlineView numberOfColumns]-1)) - [this->m_OutlineView moveColumn:[this->m_OutlineView numberOfColumns]-1 toColumn:pos]; + [m_OutlineView addTableColumn:nativeColumn]; + if (pos != static_cast([m_OutlineView numberOfColumns]-1)) + [m_OutlineView moveColumn:[m_OutlineView numberOfColumns]-1 toColumn:pos]; // done: return true; } @@ -1746,81 +1746,81 @@ bool wxCocoaDataViewControl::InsertColumn(unsigned int pos, wxDataViewColumn* co bool wxCocoaDataViewControl::Add(wxDataViewItem const& parent, wxDataViewItem const& WXUNUSED(item)) { if (parent.IsOk()) - [this->m_OutlineView reloadItem:[this->m_DataSource getDataViewItemFromBuffer:parent] reloadChildren:YES]; + [m_OutlineView reloadItem:[m_DataSource getDataViewItemFromBuffer:parent] reloadChildren:YES]; else - [this->m_OutlineView reloadData]; + [m_OutlineView reloadData]; return true; } bool wxCocoaDataViewControl::Add(wxDataViewItem const& parent, wxDataViewItemArray const& WXUNUSED(items)) { if (parent.IsOk()) - [this->m_OutlineView reloadItem:[this->m_DataSource getDataViewItemFromBuffer:parent] reloadChildren:YES]; + [m_OutlineView reloadItem:[m_DataSource getDataViewItemFromBuffer:parent] reloadChildren:YES]; else - [this->m_OutlineView reloadData]; + [m_OutlineView reloadData]; return true; } void wxCocoaDataViewControl::Collapse(wxDataViewItem const& item) { - [this->m_OutlineView collapseItem:[this->m_DataSource getDataViewItemFromBuffer:item]]; + [m_OutlineView collapseItem:[m_DataSource getDataViewItemFromBuffer:item]]; } void wxCocoaDataViewControl::EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) { if (item.IsOk()) { - [this->m_OutlineView scrollRowToVisible:[this->m_OutlineView rowForItem:[this->m_DataSource getDataViewItemFromBuffer:item]]]; + [m_OutlineView scrollRowToVisible:[m_OutlineView rowForItem:[m_DataSource getDataViewItemFromBuffer:item]]]; if (columnPtr != NULL) - [this->m_OutlineView scrollColumnToVisible:this->GetColumnPosition(columnPtr)]; + [m_OutlineView scrollColumnToVisible:GetColumnPosition(columnPtr)]; } } void wxCocoaDataViewControl::Expand(wxDataViewItem const& item) { - [this->m_OutlineView expandItem:[this->m_DataSource getDataViewItemFromBuffer:item]]; + [m_OutlineView expandItem:[m_DataSource getDataViewItemFromBuffer:item]]; } -unsigned int wxCocoaDataViewControl::GetCount(void) const +unsigned int wxCocoaDataViewControl::GetCount() const { - return [this->m_OutlineView numberOfRows]; + return [m_OutlineView numberOfRows]; } wxRect wxCocoaDataViewControl::GetRectangle(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) { - return wxFromNSRect([m_osxView superview],[this->m_OutlineView frameOfCellAtColumn:this->GetColumnPosition(columnPtr) - row:[this->m_OutlineView rowForItem:[this->m_DataSource getDataViewItemFromBuffer:item]]]); + return wxFromNSRect([m_osxView superview],[m_OutlineView frameOfCellAtColumn:GetColumnPosition(columnPtr) + row:[m_OutlineView rowForItem:[m_DataSource getDataViewItemFromBuffer:item]]]); } bool wxCocoaDataViewControl::IsExpanded(wxDataViewItem const& item) const { - return [this->m_OutlineView isItemExpanded:[this->m_DataSource getDataViewItemFromBuffer:item]]; + return [m_OutlineView isItemExpanded:[m_DataSource getDataViewItemFromBuffer:item]]; } -bool wxCocoaDataViewControl::Reload(void) +bool wxCocoaDataViewControl::Reload() { - [this->m_DataSource clearBuffers]; - [this->m_OutlineView scrollColumnToVisible:0]; - [this->m_OutlineView scrollRowToVisible:0]; - [this->m_OutlineView reloadData]; + [m_DataSource clearBuffers]; + [m_OutlineView scrollColumnToVisible:0]; + [m_OutlineView scrollRowToVisible:0]; + [m_OutlineView reloadData]; return true; } bool wxCocoaDataViewControl::Remove(wxDataViewItem const& parent, wxDataViewItem const& WXUNUSED(item)) { if (parent.IsOk()) - [this->m_OutlineView reloadItem:[this->m_DataSource getDataViewItemFromBuffer:parent] reloadChildren:YES]; + [m_OutlineView reloadItem:[m_DataSource getDataViewItemFromBuffer:parent] reloadChildren:YES]; else - [this->m_OutlineView reloadData]; + [m_OutlineView reloadData]; return true; } bool wxCocoaDataViewControl::Remove(wxDataViewItem const& parent, wxDataViewItemArray const& WXUNUSED(item)) { if (parent.IsOk()) - [this->m_OutlineView reloadItem:[this->m_DataSource getDataViewItemFromBuffer:parent] reloadChildren:YES]; + [m_OutlineView reloadItem:[m_DataSource getDataViewItemFromBuffer:parent] reloadChildren:YES]; else - [this->m_OutlineView reloadData]; + [m_OutlineView reloadData]; return true; } @@ -1831,14 +1831,14 @@ bool wxCocoaDataViewControl::Update(wxDataViewColumn const* columnPtr) bool wxCocoaDataViewControl::Update(wxDataViewItem const& WXUNUSED(parent), wxDataViewItem const& item) { - [this->m_OutlineView reloadItem:[this->m_DataSource getDataViewItemFromBuffer:item]]; + [m_OutlineView reloadItem:[m_DataSource getDataViewItemFromBuffer:item]]; return true; } bool wxCocoaDataViewControl::Update(wxDataViewItem const& WXUNUSED(parent), wxDataViewItemArray const& items) { for (size_t i=0; im_OutlineView reloadItem:[this->m_DataSource getDataViewItemFromBuffer:items[i]]]; + [m_OutlineView reloadItem:[m_DataSource getDataViewItemFromBuffer:items[i]]]; return true; } @@ -1847,16 +1847,16 @@ bool wxCocoaDataViewControl::Update(wxDataViewItem const& WXUNUSED(parent), wxDa // bool wxCocoaDataViewControl::AssociateModel(wxDataViewModel* model) { - [this->m_DataSource release]; + [m_DataSource release]; if (model != NULL) { - this->m_DataSource = [[wxCocoaOutlineDataSource alloc] init]; - [this->m_DataSource setImplementation:this]; - [this->m_DataSource setModel:model]; + m_DataSource = [[wxCocoaOutlineDataSource alloc] init]; + [m_DataSource setImplementation:this]; + [m_DataSource setModel:model]; } else - this->m_DataSource = NULL; - [this->m_OutlineView setDataSource:this->m_DataSource]; // if there is a data source the data is immediately going to be requested + m_DataSource = NULL; + [m_OutlineView setDataSource:m_DataSource]; // if there is a data source the data is immediately going to be requested return true; } @@ -1865,7 +1865,7 @@ bool wxCocoaDataViewControl::AssociateModel(wxDataViewModel* model) // int wxCocoaDataViewControl::GetSelections(wxDataViewItemArray& sel) const { - NSIndexSet* selectedRowIndexes([this->m_OutlineView selectedRowIndexes]); + NSIndexSet* selectedRowIndexes([m_OutlineView selectedRowIndexes]); NSUInteger indexRow; @@ -1875,7 +1875,7 @@ int wxCocoaDataViewControl::GetSelections(wxDataViewItemArray& sel) const indexRow = [selectedRowIndexes firstIndex]; while (indexRow != NSNotFound) { - sel.Add(wxDataViewItem([[this->m_OutlineView itemAtRow:indexRow] pointer])); + sel.Add(wxDataViewItem([[m_OutlineView itemAtRow:indexRow] pointer])); indexRow = [selectedRowIndexes indexGreaterThanIndex:indexRow]; } return sel.GetCount(); @@ -1883,38 +1883,38 @@ int wxCocoaDataViewControl::GetSelections(wxDataViewItemArray& sel) const bool wxCocoaDataViewControl::IsSelected(wxDataViewItem const& item) const { - return [this->m_OutlineView isRowSelected:[this->m_OutlineView rowForItem:[this->m_DataSource getDataViewItemFromBuffer:item]]]; + return [m_OutlineView isRowSelected:[m_OutlineView rowForItem:[m_DataSource getDataViewItemFromBuffer:item]]]; } void wxCocoaDataViewControl::Select(wxDataViewItem const& item) { if (item.IsOk()) - [this->m_OutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[this->m_OutlineView rowForItem:[this->m_DataSource getDataViewItemFromBuffer:item]]] + [m_OutlineView selectRowIndexes:[NSIndexSet indexSetWithIndex:[m_OutlineView rowForItem:[m_DataSource getDataViewItemFromBuffer:item]]] byExtendingSelection:NO]; } -void wxCocoaDataViewControl::SelectAll(void) +void wxCocoaDataViewControl::SelectAll() { - [this->m_OutlineView selectAll:this->m_OutlineView]; + [m_OutlineView selectAll:m_OutlineView]; } void wxCocoaDataViewControl::Unselect(wxDataViewItem const& item) { if (item.IsOk()) - [this->m_OutlineView deselectRow:[this->m_OutlineView rowForItem:[this->m_DataSource getDataViewItemFromBuffer:item]]]; + [m_OutlineView deselectRow:[m_OutlineView rowForItem:[m_DataSource getDataViewItemFromBuffer:item]]]; } -void wxCocoaDataViewControl::UnselectAll(void) +void wxCocoaDataViewControl::UnselectAll() { - [this->m_OutlineView deselectAll:this->m_OutlineView]; + [m_OutlineView deselectAll:m_OutlineView]; } // // sorting related methods // -wxDataViewColumn* wxCocoaDataViewControl::GetSortingColumn(void) const +wxDataViewColumn* wxCocoaDataViewControl::GetSortingColumn() const { - NSArray* const columns = [this->m_OutlineView tableColumns]; + NSArray* const columns = [m_OutlineView tableColumns]; UInt32 const noOfColumns = [columns count]; @@ -1925,10 +1925,10 @@ wxDataViewColumn* wxCocoaDataViewControl::GetSortingColumn(void) const return NULL; } -void wxCocoaDataViewControl::Resort(void) +void wxCocoaDataViewControl::Resort() { - [this->m_DataSource clearChildren]; - [this->m_OutlineView reloadData]; + [m_DataSource clearChildren]; + [m_OutlineView reloadData]; } // @@ -1936,23 +1936,23 @@ void wxCocoaDataViewControl::Resort(void) // void wxCocoaDataViewControl::DoSetIndent(int indent) { - [this->m_OutlineView setIndentationPerLevel:static_cast(indent)]; + [m_OutlineView setIndentationPerLevel:static_cast(indent)]; } void wxCocoaDataViewControl::HitTest(wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const { - NSPoint const nativePoint = wxToNSPoint((NSScrollView*) this->GetWXWidget(),point); + NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),point); int indexColumn; int indexRow; - indexColumn = [this->m_OutlineView columnAtPoint:nativePoint]; - indexRow = [this->m_OutlineView rowAtPoint: nativePoint]; + indexColumn = [m_OutlineView columnAtPoint:nativePoint]; + indexRow = [m_OutlineView rowAtPoint: nativePoint]; if ((indexColumn >= 0) && (indexRow >= 0)) { - columnPtr = reinterpret_cast([[[[this->m_OutlineView tableColumns] objectAtIndex:indexColumn] identifier] pointer]); - item = wxDataViewItem([[this->m_OutlineView itemAtRow:indexRow] pointer]); + columnPtr = reinterpret_cast([[[[m_OutlineView tableColumns] objectAtIndex:indexColumn] identifier] pointer]); + item = wxDataViewItem([[m_OutlineView itemAtRow:indexRow] pointer]); } else { @@ -1966,10 +1966,10 @@ void wxCocoaDataViewControl::SetRowHeight(wxDataViewItem const& WXUNUSED(item), { } -void wxCocoaDataViewControl::OnSize(void) +void wxCocoaDataViewControl::OnSize() { - if ([this->m_OutlineView numberOfColumns] == 1) - [this->m_OutlineView sizeLastColumnToFit]; + if ([m_OutlineView numberOfColumns] == 1) + [m_OutlineView sizeLastColumnToFit]; } // @@ -2071,28 +2071,28 @@ wxDataViewRenderer::wxDataViewRenderer(wxString const& varianttype, wxDataViewCe { } -wxDataViewRenderer::~wxDataViewRenderer(void) +wxDataViewRenderer::~wxDataViewRenderer() { - delete this->m_NativeDataPtr; + delete m_NativeDataPtr; } void wxDataViewRenderer::SetAlignment(int align) { - this->m_alignment = align; - [this->GetNativeData()->GetColumnCell() setAlignment:ConvertToNativeHorizontalTextAlignment(align)]; + m_alignment = align; + [GetNativeData()->GetColumnCell() setAlignment:ConvertToNativeHorizontalTextAlignment(align)]; } void wxDataViewRenderer::SetMode(wxDataViewCellMode mode) { - this->m_mode = mode; - if (this->GetOwner() != NULL) - [this->GetOwner()->GetNativeData()->GetNativeColumnPtr() setEditable:(mode == wxDATAVIEW_CELL_EDITABLE)]; + m_mode = mode; + if (GetOwner() != NULL) + [GetOwner()->GetNativeData()->GetNativeColumnPtr() setEditable:(mode == wxDATAVIEW_CELL_EDITABLE)]; } void wxDataViewRenderer::SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr) { - delete this->m_NativeDataPtr; - this->m_NativeDataPtr = newNativeDataPtr; + delete m_NativeDataPtr; + m_NativeDataPtr = newNativeDataPtr; } IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer,wxDataViewRendererBase) @@ -2103,14 +2103,14 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewRenderer,wxDataViewRendererBase) wxDataViewCustomRenderer::wxDataViewCustomRenderer(wxString const& varianttype, wxDataViewCellMode mode, int align) :wxDataViewRenderer(varianttype,mode,align), m_editorCtrlPtr(NULL), m_DCPtr(NULL) { - this->SetNativeData(new wxDataViewRendererNativeData([[wxCustomCell alloc] init])); + SetNativeData(new wxDataViewRendererNativeData([[wxCustomCell alloc] init])); } bool wxDataViewCustomRenderer::MacRender() { - [this->GetNativeData()->GetItemCell() setObjectValue:[[[wxCustomRendererObject alloc] initWithRenderer:this - item:this->GetNativeData()->GetItem() - column:this->GetNativeData()->GetColumnPtr()] autorelease]]; + [GetNativeData()->GetItemCell() setObjectValue:[[[wxCustomRendererObject alloc] initWithRenderer:this + item:GetNativeData()->GetItem() + column:GetNativeData()->GetColumnPtr()] autorelease]]; return true; } @@ -2128,20 +2128,20 @@ wxDataViewTextRenderer::wxDataViewTextRenderer(wxString const& varianttype, wxDa cell = [[NSTextFieldCell alloc] init]; [cell setAlignment:ConvertToNativeHorizontalTextAlignment(align)]; [cell setLineBreakMode:NSLineBreakByTruncatingMiddle]; - this->SetNativeData(new wxDataViewRendererNativeData(cell)); + SetNativeData(new wxDataViewRendererNativeData(cell)); [cell release]; } bool wxDataViewTextRenderer::MacRender() { - if (this->GetValue().GetType() == this->GetVariantType()) + if (GetValue().GetType() == GetVariantType()) { - [this->GetNativeData()->GetItemCell() setObjectValue:wxCFStringRef(this->GetValue().GetString()).AsNSString()]; + [GetNativeData()->GetItemCell() setObjectValue:wxCFStringRef(GetValue().GetString()).AsNSString()]; return true; } else { - wxFAIL_MSG(wxString(_("Text renderer cannot render value because of wrong value type; value type: ")) << this->GetValue().GetType()); + wxFAIL_MSG(wxString(_("Text renderer cannot render value because of wrong value type; value type: ")) << GetValue().GetType()); return false; } } @@ -2158,7 +2158,7 @@ wxDataViewBitmapRenderer::wxDataViewBitmapRenderer(wxString const& varianttype, cell = [[NSImageCell alloc] init]; - this->SetNativeData(new wxDataViewRendererNativeData(cell)); + SetNativeData(new wxDataViewRendererNativeData(cell)); [cell release]; } @@ -2168,13 +2168,13 @@ bool wxDataViewBitmapRenderer::MacRender() // - the passed bitmap is invalid (or is not initialized); this case simulates a non-existing bitmap. // In all other cases the method returns 'false'. { - wxCHECK_MSG(this->GetValue().GetType() == this->GetVariantType(),false,wxString(_("Bitmap renderer cannot render value; value type: ")) << this->GetValue().GetType()); + wxCHECK_MSG(GetValue().GetType() == GetVariantType(),false,wxString(_("Bitmap renderer cannot render value; value type: ")) << GetValue().GetType()); wxBitmap bitmap; - bitmap << this->GetValue(); + bitmap << GetValue(); if (bitmap.IsOk()) - [this->GetNativeData()->GetItemCell() setObjectValue:[[bitmap.GetNSImage() retain] autorelease]]; + [GetNativeData()->GetItemCell() setObjectValue:[[bitmap.GetNSImage() retain] autorelease]]; return true; } @@ -2194,20 +2194,20 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer(wxArrayString const& choices, [cell setFont:[[NSFont fontWithName:[[cell font] fontName] size:[NSFont systemFontSizeForControlSize:NSMiniControlSize]] autorelease]]; for (size_t i=0; iSetNativeData(new wxDataViewRendererNativeData(cell)); + SetNativeData(new wxDataViewRendererNativeData(cell)); [cell release]; } bool wxDataViewChoiceRenderer::MacRender() { - if (this->GetValue().GetType() == this->GetVariantType()) + if (GetValue().GetType() == GetVariantType()) { - [((NSPopUpButtonCell*) this->GetNativeData()->GetItemCell()) selectItemWithTitle:[[wxCFStringRef(this->GetValue().GetString()).AsNSString() retain] autorelease]]; + [((NSPopUpButtonCell*) GetNativeData()->GetItemCell()) selectItemWithTitle:[[wxCFStringRef(GetValue().GetString()).AsNSString() retain] autorelease]]; return true; } else { - wxFAIL_MSG(wxString(_("Choice renderer cannot render value because of wrong value type; value type: ")) << this->GetValue().GetType()); + wxFAIL_MSG(wxString(_("Choice renderer cannot render value because of wrong value type; value type: ")) << GetValue().GetType()); return false; } } @@ -2231,16 +2231,16 @@ wxDataViewDateRenderer::wxDataViewDateRenderer(wxString const& varianttype, wxDa cell = [[NSTextFieldCell alloc] init]; [cell setFormatter:dateFormatter]; [cell setLineBreakMode:NSLineBreakByTruncatingMiddle]; - this->SetNativeData(new wxDataViewRendererNativeData(cell,[NSDate dateWithString:@"2000-12-30 20:00:00 +0000"])); + SetNativeData(new wxDataViewRendererNativeData(cell,[NSDate dateWithString:@"2000-12-30 20:00:00 +0000"])); [cell release]; [dateFormatter release]; } bool wxDataViewDateRenderer::MacRender() { - if (this->GetValue().GetType() == this->GetVariantType()) + if (GetValue().GetType() == GetVariantType()) { - if (this->GetValue().GetDateTime().IsValid()) + if (GetValue().GetDateTime().IsValid()) { // -- find best fitting style to show the date -- // as the style should be identical for all cells a reference date instead of the actual cell's date @@ -2252,31 +2252,31 @@ bool wxDataViewDateRenderer::MacRender() // if the shortest time and date format does not fit into the cell the time part is dropped; // remark: the time part itself is not modified per iteration loop and only uses the short style, // means that only the hours and minutes are being shown - [this->GetNativeData()->GetItemCell() setObjectValue:this->GetNativeData()->GetObject()]; // GetObject() returns a date for testing the size of a date object - [[this->GetNativeData()->GetItemCell() formatter] setTimeStyle:NSDateFormatterShortStyle]; + [GetNativeData()->GetItemCell() setObjectValue:GetNativeData()->GetObject()]; // GetObject() returns a date for testing the size of a date object + [[GetNativeData()->GetItemCell() formatter] setTimeStyle:NSDateFormatterShortStyle]; for (int dateFormatterStyle=4; dateFormatterStyle>0; --dateFormatterStyle) { - [[this->GetNativeData()->GetItemCell() formatter] setDateStyle:(NSDateFormatterStyle)dateFormatterStyle]; + [[GetNativeData()->GetItemCell() formatter] setDateStyle:(NSDateFormatterStyle)dateFormatterStyle]; if (dateFormatterStyle == 1) { // if the shortest style for displaying the date and time is too long to be fully visible remove the time part of the date: - if ([this->GetNativeData()->GetItemCell() cellSize].width > [this->GetNativeData()->GetColumnPtr() width]) - [[this->GetNativeData()->GetItemCell() formatter] setTimeStyle:NSDateFormatterNoStyle]; + if ([GetNativeData()->GetItemCell() cellSize].width > [GetNativeData()->GetColumnPtr() width]) + [[GetNativeData()->GetItemCell() formatter] setTimeStyle:NSDateFormatterNoStyle]; break; // basically not necessary as the loop would end anyway but let's save the last comparison } - else if ([this->GetNativeData()->GetItemCell() cellSize].width <= [this->GetNativeData()->GetColumnPtr() width]) + else if ([GetNativeData()->GetItemCell() cellSize].width <= [GetNativeData()->GetColumnPtr() width]) break; } // set data (the style is set by the previous loop); // on OSX the date has to be specified with respect to UTC; in wxWidgets the date is always entered in the local timezone; so, we have to do a conversion // from the local to UTC timezone when adding the seconds to 1970-01-01 UTC: - [this->GetNativeData()->GetItemCell() setObjectValue:[NSDate dateWithTimeIntervalSince1970:this->GetValue().GetDateTime().ToUTC().Subtract(wxDateTime(1,wxDateTime::Jan,1970)).GetSeconds().ToDouble()]]; + [GetNativeData()->GetItemCell() setObjectValue:[NSDate dateWithTimeIntervalSince1970:GetValue().GetDateTime().ToUTC().Subtract(wxDateTime(1,wxDateTime::Jan,1970)).GetSeconds().ToDouble()]]; } return true; } else { - wxFAIL_MSG(wxString(_("Date renderer cannot render value because of wrong value type; value type: ")) << this->GetValue().GetType()); + wxFAIL_MSG(wxString(_("Date renderer cannot render value because of wrong value type; value type: ")) << GetValue().GetType()); return false; } } @@ -2294,20 +2294,20 @@ wxDataViewIconTextRenderer::wxDataViewIconTextRenderer(wxString const& variantty cell = [[wxImageTextCell alloc] init]; [cell setAlignment:ConvertToNativeHorizontalTextAlignment(align)]; - this->SetNativeData(new wxDataViewRendererNativeData(cell)); + SetNativeData(new wxDataViewRendererNativeData(cell)); [cell release]; } bool wxDataViewIconTextRenderer::MacRender() { - if (this->GetValue().GetType() == this->GetVariantType()) + if (GetValue().GetType() == GetVariantType()) { wxDataViewIconText iconText; wxImageTextCell* cell; - cell = (wxImageTextCell*) this->GetNativeData()->GetItemCell(); - iconText << this->GetValue(); + cell = (wxImageTextCell*) GetNativeData()->GetItemCell(); + iconText << GetValue(); if (iconText.GetIcon().IsOk()) [cell setImage:[[wxBitmap(iconText.GetIcon()).GetNSImage() retain] autorelease]]; [cell setStringValue:[[wxCFStringRef(iconText.GetText()).AsNSString() retain] autorelease]]; @@ -2315,7 +2315,7 @@ bool wxDataViewIconTextRenderer::MacRender() } else { - wxFAIL_MSG(wxString(_("Icon & text renderer cannot render value because of wrong value type; value type: ")) << this->GetValue().GetType()); + wxFAIL_MSG(wxString(_("Icon & text renderer cannot render value because of wrong value type; value type: ")) << GetValue().GetType()); return false; } } @@ -2335,20 +2335,20 @@ wxDataViewToggleRenderer::wxDataViewToggleRenderer(wxString const& varianttype, [cell setAlignment:ConvertToNativeHorizontalTextAlignment(align)]; [cell setButtonType:NSSwitchButton]; [cell setImagePosition:NSImageOnly]; - this->SetNativeData(new wxDataViewRendererNativeData(cell)); + SetNativeData(new wxDataViewRendererNativeData(cell)); [cell release]; } bool wxDataViewToggleRenderer::MacRender() { - if (this->GetValue().GetType() == this->GetVariantType()) + if (GetValue().GetType() == GetVariantType()) { - [this->GetNativeData()->GetItemCell() setIntValue:this->GetValue().GetLong()]; + [GetNativeData()->GetItemCell() setIntValue:GetValue().GetLong()]; return true; } else { - wxFAIL_MSG(wxString(_("Toggle renderer cannot render value because of wrong value type; value type: ")) << this->GetValue().GetType()); + wxFAIL_MSG(wxString(_("Toggle renderer cannot render value because of wrong value type; value type: ")) << GetValue().GetType()); return false; } } @@ -2367,20 +2367,20 @@ wxDataViewProgressRenderer::wxDataViewProgressRenderer(wxString const& label, wx cell = [[NSLevelIndicatorCell alloc] initWithLevelIndicatorStyle:NSContinuousCapacityLevelIndicatorStyle]; [cell setMinValue:0]; [cell setMaxValue:100]; - this->SetNativeData(new wxDataViewRendererNativeData(cell)); + SetNativeData(new wxDataViewRendererNativeData(cell)); [cell release]; } bool wxDataViewProgressRenderer::MacRender() { - if (this->GetValue().GetType() == this->GetVariantType()) + if (GetValue().GetType() == GetVariantType()) { - [this->GetNativeData()->GetItemCell() setIntValue:this->GetValue().GetLong()]; + [GetNativeData()->GetItemCell() setIntValue:GetValue().GetLong()]; return true; } else { - wxFAIL_MSG(wxString(_("Progress renderer cannot render value because of wrong value type; value type: ")) << this->GetValue().GetType()); + wxFAIL_MSG(wxString(_("Progress renderer cannot render value because of wrong value type; value type: ")) << GetValue().GetType()); return false; } } @@ -2393,7 +2393,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer,wxDataViewRenderer) wxDataViewColumn::wxDataViewColumn(const wxString& title, wxDataViewRenderer* renderer, unsigned int model_column, int width, wxAlignment align, int flags) :wxDataViewColumnBase(renderer, model_column), m_NativeDataPtr(new wxDataViewColumnNativeData()), m_title(title) { - this->InitCommon(width, align, flags); + InitCommon(width, align, flags); if ((renderer != NULL) && (renderer->GetAlignment() == wxDVR_DEFAULT_ALIGNMENT)) renderer->SetAlignment(align); } @@ -2401,47 +2401,47 @@ wxDataViewColumn::wxDataViewColumn(const wxString& title, wxDataViewRenderer* re wxDataViewColumn::wxDataViewColumn(const wxBitmap& bitmap, wxDataViewRenderer* renderer, unsigned int model_column, int width, wxAlignment align, int flags) :wxDataViewColumnBase(bitmap, renderer, model_column), m_NativeDataPtr(new wxDataViewColumnNativeData()) { - this->InitCommon(width, align, flags); + InitCommon(width, align, flags); if ((renderer != NULL) && (renderer->GetAlignment() == wxDVR_DEFAULT_ALIGNMENT)) renderer->SetAlignment(align); } -wxDataViewColumn::~wxDataViewColumn(void) +wxDataViewColumn::~wxDataViewColumn() { - delete this->m_NativeDataPtr; + delete m_NativeDataPtr; } bool wxDataViewColumn::IsSortKey() const { - return ((this->GetNativeData()->GetNativeColumnPtr() != NULL) && ([this->GetNativeData()->GetNativeColumnPtr() sortDescriptorPrototype] != nil)); + return ((GetNativeData()->GetNativeColumnPtr() != NULL) && ([GetNativeData()->GetNativeColumnPtr() sortDescriptorPrototype] != nil)); } void wxDataViewColumn::SetAlignment(wxAlignment align) { - this->m_alignment = align; - [[this->m_NativeDataPtr->GetNativeColumnPtr() headerCell] setAlignment:ConvertToNativeHorizontalTextAlignment(align)]; - if ((this->m_renderer != NULL) && (this->m_renderer->GetAlignment() == wxDVR_DEFAULT_ALIGNMENT)) - this->m_renderer->SetAlignment(align); + m_alignment = align; + [[m_NativeDataPtr->GetNativeColumnPtr() headerCell] setAlignment:ConvertToNativeHorizontalTextAlignment(align)]; + if ((m_renderer != NULL) && (m_renderer->GetAlignment() == wxDVR_DEFAULT_ALIGNMENT)) + m_renderer->SetAlignment(align); } void wxDataViewColumn::SetBitmap(wxBitmap const& bitmap) { // bitmaps and titles cannot exist at the same time - if the bitmap is set the title is removed: - this->m_title = wxEmptyString; - this->wxDataViewColumnBase::SetBitmap(bitmap); - [[this->m_NativeDataPtr->GetNativeColumnPtr() headerCell] setImage:[[bitmap.GetNSImage() retain] autorelease]]; + m_title = wxEmptyString; + wxDataViewColumnBase::SetBitmap(bitmap); + [[m_NativeDataPtr->GetNativeColumnPtr() headerCell] setImage:[[bitmap.GetNSImage() retain] autorelease]]; } void wxDataViewColumn::SetMaxWidth(int maxWidth) { - this->m_maxWidth = maxWidth; - [this->m_NativeDataPtr->GetNativeColumnPtr() setMaxWidth:maxWidth]; + m_maxWidth = maxWidth; + [m_NativeDataPtr->GetNativeColumnPtr() setMaxWidth:maxWidth]; } void wxDataViewColumn::SetMinWidth(int minWidth) { - this->m_minWidth = minWidth; - [this->m_NativeDataPtr->GetNativeColumnPtr() setMinWidth:minWidth]; + m_minWidth = minWidth; + [m_NativeDataPtr->GetNativeColumnPtr() setMinWidth:minWidth]; } void wxDataViewColumn::SetReorderable(bool reorderable) @@ -2450,16 +2450,16 @@ void wxDataViewColumn::SetReorderable(bool reorderable) void wxDataViewColumn::SetResizeable(bool resizeable) { - this->wxDataViewColumnBase::SetResizeable(resizeable); + wxDataViewColumnBase::SetResizeable(resizeable); if (resizeable) - [this->m_NativeDataPtr->GetNativeColumnPtr() setResizingMask:NSTableColumnUserResizingMask]; + [m_NativeDataPtr->GetNativeColumnPtr() setResizingMask:NSTableColumnUserResizingMask]; else - [this->m_NativeDataPtr->GetNativeColumnPtr() setResizingMask:NSTableColumnNoResizing]; + [m_NativeDataPtr->GetNativeColumnPtr() setResizingMask:NSTableColumnNoResizing]; } void wxDataViewColumn::SetSortable(bool sortable) { - this->wxDataViewColumnBase::SetSortable(sortable); + wxDataViewColumnBase::SetSortable(sortable); } void wxDataViewColumn::SetSortOrder(bool ascending) @@ -2467,14 +2467,14 @@ void wxDataViewColumn::SetSortOrder(bool ascending) if (m_ascending != ascending) { m_ascending = ascending; - if (this->IsSortKey()) + if (IsSortKey()) { // change sorting order: NSArray* sortDescriptors; NSSortDescriptor* sortDescriptor; NSTableColumn* tableColumn; - tableColumn = this->m_NativeDataPtr->GetNativeColumnPtr(); + tableColumn = m_NativeDataPtr->GetNativeColumnPtr(); sortDescriptor = [[NSSortDescriptor alloc] initWithKey:[[tableColumn sortDescriptorPrototype] key] ascending:m_ascending]; sortDescriptors = [NSArray arrayWithObject:sortDescriptor]; [tableColumn setSortDescriptorPrototype:sortDescriptor]; @@ -2487,15 +2487,15 @@ void wxDataViewColumn::SetSortOrder(bool ascending) void wxDataViewColumn::SetTitle(wxString const& title) { // bitmaps and titles cannot exist at the same time - if the title is set the bitmap is removed: - this->wxDataViewColumnBase::SetBitmap(wxBitmap()); - this->m_title = title; - [[this->m_NativeDataPtr->GetNativeColumnPtr() headerCell] setStringValue:[[wxCFStringRef(title).AsNSString() retain] autorelease]]; + wxDataViewColumnBase::SetBitmap(wxBitmap()); + m_title = title; + [[m_NativeDataPtr->GetNativeColumnPtr() headerCell] setStringValue:[[wxCFStringRef(title).AsNSString() retain] autorelease]]; } void wxDataViewColumn::SetWidth(int width) { - [this->m_NativeDataPtr->GetNativeColumnPtr() setWidth:width]; - this->m_width = width; + [m_NativeDataPtr->GetNativeColumnPtr() setWidth:width]; + m_width = width; } void wxDataViewColumn::SetAsSortKey(bool WXUNUSED(sort)) @@ -2506,7 +2506,7 @@ void wxDataViewColumn::SetAsSortKey(bool WXUNUSED(sort)) void wxDataViewColumn::SetNativeData(wxDataViewColumnNativeData* newNativeDataPtr) { - delete this->m_NativeDataPtr; - this->m_NativeDataPtr = newNativeDataPtr; + delete m_NativeDataPtr; + m_NativeDataPtr = newNativeDataPtr; } #endif // (wxUSE_DATAVIEWCTRL == 1) && !defined(wxUSE_GENERICDATAVIEWCTRL) diff --git a/src/osx/dataview_osx.cpp b/src/osx/dataview_osx.cpp index b8f33a85a2..9ffcb8af46 100644 --- a/src/osx/dataview_osx.cpp +++ b/src/osx/dataview_osx.cpp @@ -97,8 +97,8 @@ bool wxOSXDataViewModelNotifier::ItemAdded(wxDataViewItem const& parent, wxDataV wxCHECK_MSG(item.IsOk(),false,_("Added item is invalid.")); - noFailureFlag = this->m_DataViewCtrlPtr->GetDataViewPeer()->Add(parent,item); - this->AdjustRowHeight(item); + noFailureFlag = m_DataViewCtrlPtr->GetDataViewPeer()->Add(parent,item); + AdjustRowHeight(item); return noFailureFlag; } @@ -108,9 +108,9 @@ bool wxOSXDataViewModelNotifier::ItemsAdded(wxDataViewItem const& parent, wxData // insert all valid items into control: - noFailureFlag = this->m_DataViewCtrlPtr->GetDataViewPeer()->Add(parent,items); + noFailureFlag = m_DataViewCtrlPtr->GetDataViewPeer()->Add(parent,items); // adjust row heights: - this->AdjustRowHeights(items); + AdjustRowHeights(items); // done: return noFailureFlag; } @@ -118,18 +118,18 @@ bool wxOSXDataViewModelNotifier::ItemsAdded(wxDataViewItem const& parent, wxData bool wxOSXDataViewModelNotifier::ItemChanged(wxDataViewItem const& item) { wxCHECK_MSG(item.IsOk(), false,_("Changed item is invalid.")); - wxCHECK_MSG(this->GetOwner() != NULL,false,_("Owner not initialized.")); - if (this->m_DataViewCtrlPtr->GetDataViewPeer()->Update(this->GetOwner()->GetParent(item),item)) + wxCHECK_MSG(GetOwner() != NULL,false,_("Owner not initialized.")); + if (m_DataViewCtrlPtr->GetDataViewPeer()->Update(GetOwner()->GetParent(item),item)) { // sent the equivalent wxWidget event: - wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,this->m_DataViewCtrlPtr->GetId()); + wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId()); - dataViewEvent.SetEventObject(this->m_DataViewCtrlPtr); + dataViewEvent.SetEventObject(m_DataViewCtrlPtr); dataViewEvent.SetItem(item); // sent the equivalent wxWidget event: - this->m_DataViewCtrlPtr->HandleWindowEvent(dataViewEvent); + m_DataViewCtrlPtr->HandleWindowEvent(dataViewEvent); // row height may have to be adjusted: - this->AdjustRowHeight(item); + AdjustRowHeight(item); // done return true; } @@ -141,21 +141,21 @@ bool wxOSXDataViewModelNotifier::ItemsChanged(wxDataViewItemArray const& items) { size_t const noOfItems = items.GetCount(); - wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,this->m_DataViewCtrlPtr->GetId()); + wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId()); - dataViewEvent.SetEventObject(this->m_DataViewCtrlPtr); + dataViewEvent.SetEventObject(m_DataViewCtrlPtr); for (size_t indexItem=0; indexItemm_DataViewCtrlPtr->GetDataViewPeer()->Update(this->GetOwner()->GetParent(items[indexItem]),items[indexItem])) + if (m_DataViewCtrlPtr->GetDataViewPeer()->Update(GetOwner()->GetParent(items[indexItem]),items[indexItem])) { // send for all changed items a wxWidget event: dataViewEvent.SetItem(items[indexItem]); - this->m_DataViewCtrlPtr->HandleWindowEvent(dataViewEvent); + m_DataViewCtrlPtr->HandleWindowEvent(dataViewEvent); } else return false; // if this location is reached all items have been updated: - this->AdjustRowHeights(items); + AdjustRowHeights(items); // done: return true; } @@ -170,10 +170,10 @@ bool wxOSXDataViewModelNotifier::ItemDeleted(wxDataViewItem const& parent, wxDat // 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: - this->m_DataViewCtrlPtr->SetDeleting(true); - noFailureFlag = this->m_DataViewCtrlPtr->GetDataViewPeer()->Remove(parent,item); + m_DataViewCtrlPtr->SetDeleting(true); + noFailureFlag = m_DataViewCtrlPtr->GetDataViewPeer()->Remove(parent,item); // enable automatic updating again: - this->m_DataViewCtrlPtr->SetDeleting(false); + m_DataViewCtrlPtr->SetDeleting(false); // done: return noFailureFlag; } @@ -187,11 +187,11 @@ bool wxOSXDataViewModelNotifier::ItemsDeleted(wxDataViewItem const& parent, wxDa // 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: - this->m_DataViewCtrlPtr->SetDeleting(true); + m_DataViewCtrlPtr->SetDeleting(true); // delete all specified items: - noFailureFlag = this->m_DataViewCtrlPtr->GetDataViewPeer()->Remove(parent,items); + noFailureFlag = m_DataViewCtrlPtr->GetDataViewPeer()->Remove(parent,items); // enable automatic updating again: - this->m_DataViewCtrlPtr->SetDeleting(false); + m_DataViewCtrlPtr->SetDeleting(false); // done: return noFailureFlag; } @@ -199,16 +199,16 @@ bool wxOSXDataViewModelNotifier::ItemsDeleted(wxDataViewItem const& parent, wxDa bool wxOSXDataViewModelNotifier::ValueChanged(wxDataViewItem const& item, unsigned int col) { wxCHECK_MSG(item.IsOk(), false,_("Passed item is invalid.")); - wxCHECK_MSG(this->GetOwner() != NULL,false,_("Owner not initialized.")); - if (this->m_DataViewCtrlPtr->GetDataViewPeer()->Update(this->GetOwner()->GetParent(item),item)) + wxCHECK_MSG(GetOwner() != NULL,false,_("Owner not initialized.")); + if (m_DataViewCtrlPtr->GetDataViewPeer()->Update(GetOwner()->GetParent(item),item)) { - wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,this->m_DataViewCtrlPtr->GetId()); + wxDataViewEvent dataViewEvent(wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED,m_DataViewCtrlPtr->GetId()); - dataViewEvent.SetEventObject(this->m_DataViewCtrlPtr); + dataViewEvent.SetEventObject(m_DataViewCtrlPtr); dataViewEvent.SetColumn(col); dataViewEvent.SetItem(item); // send the equivalent wxWidget event: - this->m_DataViewCtrlPtr->HandleWindowEvent(dataViewEvent); + m_DataViewCtrlPtr->HandleWindowEvent(dataViewEvent); // done return true; } @@ -218,26 +218,26 @@ bool wxOSXDataViewModelNotifier::ValueChanged(wxDataViewItem const& item, unsign bool wxOSXDataViewModelNotifier::Cleared() { - return this->m_DataViewCtrlPtr->GetDataViewPeer()->Reload(); + return m_DataViewCtrlPtr->GetDataViewPeer()->Reload(); } void wxOSXDataViewModelNotifier::Resort() { - this->m_DataViewCtrlPtr->GetDataViewPeer()->Resort(); + m_DataViewCtrlPtr->GetDataViewPeer()->Resort(); } void wxOSXDataViewModelNotifier::AdjustRowHeight(wxDataViewItem const& item) { - if ((this->m_DataViewCtrlPtr->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) != 0) + if ((m_DataViewCtrlPtr->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) != 0) { - wxDataViewModel *model = this->GetOwner(); + wxDataViewModel *model = GetOwner(); int height = 20; // TODO find out standard height - unsigned int num = this->m_DataViewCtrlPtr->GetColumnCount(); + unsigned int num = m_DataViewCtrlPtr->GetColumnCount(); unsigned int col; for (col = 0; col < num; col++) { - wxDataViewColumn* column(this->m_DataViewCtrlPtr->GetColumnPtr(col)); + wxDataViewColumn* column(m_DataViewCtrlPtr->GetColumnPtr(col)); if (!(column->IsHidden())) { @@ -252,27 +252,27 @@ void wxOSXDataViewModelNotifier::AdjustRowHeight(wxDataViewItem const& item) } } if (height > 20) - this->m_DataViewCtrlPtr->GetDataViewPeer()->SetRowHeight(item,height); + m_DataViewCtrlPtr->GetDataViewPeer()->SetRowHeight(item,height); } } void wxOSXDataViewModelNotifier::AdjustRowHeights(wxDataViewItemArray const& items) { - if ((this->m_DataViewCtrlPtr->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) != 0) + if ((m_DataViewCtrlPtr->GetWindowStyle() & wxDV_VARIABLE_LINE_HEIGHT) != 0) { size_t const noOfItems = items.GetCount(); - wxDataViewModel *model = this->GetOwner(); + wxDataViewModel *model = GetOwner(); for (size_t itemIndex=0; itemIndexm_DataViewCtrlPtr->GetColumnCount(); + unsigned int num = m_DataViewCtrlPtr->GetColumnCount(); unsigned int col; for (col = 0; col < num; col++) { - wxDataViewColumn* column(this->m_DataViewCtrlPtr->GetColumnPtr(col)); + wxDataViewColumn* column(m_DataViewCtrlPtr->GetColumnPtr(col)); if (!(column->IsHidden())) { @@ -287,7 +287,7 @@ void wxOSXDataViewModelNotifier::AdjustRowHeights(wxDataViewItemArray const& ite } } if (height > 20) - this->m_DataViewCtrlPtr->GetDataViewPeer()->SetRowHeight(items[itemIndex],height); + m_DataViewCtrlPtr->GetDataViewPeer()->SetRowHeight(items[itemIndex],height); } } } @@ -298,9 +298,9 @@ void wxOSXDataViewModelNotifier::AdjustRowHeights(wxDataViewItemArray const& ite // dependent methods can be found in the environment's // source file. // --------------------------------------------------------- -wxDataViewCustomRenderer::~wxDataViewCustomRenderer(void) +wxDataViewCustomRenderer::~wxDataViewCustomRenderer() { - delete this->m_DCPtr; + delete m_DCPtr; } void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state ) @@ -314,9 +314,9 @@ void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset, wx wxDC* wxDataViewCustomRenderer::GetDC() { - if ((this->m_DCPtr == NULL) && (this->GetOwner() != NULL) && (this->GetOwner()->GetOwner() != NULL)) - this->m_DCPtr = new wxClientDC(this->GetOwner()->GetOwner()); - return this->m_DCPtr; + if ((m_DCPtr == NULL) && (GetOwner() != NULL) && (GetOwner()->GetOwner() != NULL)) + m_DCPtr = new wxClientDC(GetOwner()->GetOwner()); + return m_DCPtr; } void wxDataViewCustomRenderer::SetDC(wxDC* newDCPtr) @@ -331,7 +331,7 @@ void wxDataViewCustomRenderer::SetDC(wxDC* newDCPtr) wxDataViewCtrl::~wxDataViewCtrl() { - this->ClearColumns(); + ClearColumns(); } void wxDataViewCtrl::Init() @@ -344,18 +344,18 @@ void wxDataViewCtrl::Init() bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator ) { - if (!(this->wxControl::Create(parent,id,pos,size,style & ~(wxHSCROLL | wxVSCROLL),validator))) + if (!(wxControl::Create(parent,id,pos,size,style & ~(wxHSCROLL | wxVSCROLL),validator))) return false; - m_peer = ::CreateDataView(this,parent,id,pos,size,style,this->GetExtraStyle()); + m_peer = ::CreateDataView(this,parent,id,pos,size,style,GetExtraStyle()); - this->MacPostControlCreate(pos,size); + MacPostControlCreate(pos,size); return true; } bool wxDataViewCtrl::AssociateModel(wxDataViewModel* model) { - wxDataViewWidgetImpl* dataViewWidgetPtr(this->GetDataViewPeer()); + wxDataViewWidgetImpl* dataViewWidgetPtr(GetDataViewPeer()); wxCHECK_MSG(dataViewWidgetPtr != NULL,false,_("Pointer to native control must not be NULL.")); @@ -381,35 +381,35 @@ bool wxDataViewCtrl::PrependColumn(wxDataViewColumn* columnPtr) bool wxDataViewCtrl::InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr) { - wxDataViewWidgetImpl* dataViewWidgetPtr(this->GetDataViewPeer()); + wxDataViewWidgetImpl* dataViewWidgetPtr(GetDataViewPeer()); // first, some error checking: wxCHECK_MSG(dataViewWidgetPtr != NULL, false,_("Pointer to native control must not be NULL.")); wxCHECK_MSG(columnPtr != NULL, false,_("Column pointer must not be NULL.")); wxCHECK_MSG(columnPtr->GetRenderer() != NULL, false,_("Column does not have a renderer.")); - wxCHECK_MSG(this->GetModel() != NULL, false,_("No model associated with control.")); + wxCHECK_MSG(GetModel() != NULL, false,_("No model associated with control.")); wxCHECK_MSG((columnPtr->GetModelColumn() >= 0) && - (columnPtr->GetModelColumn() < this->GetModel()->GetColumnCount()),false,_("Column's model column has no equivalent in the associated model.")); + (columnPtr->GetModelColumn() < GetModel()->GetColumnCount()),false,_("Column's model column has no equivalent in the associated model.")); // add column to wxWidget's internal structure: - if (this->wxDataViewCtrlBase::InsertColumn(pos,columnPtr)) + if (wxDataViewCtrlBase::InsertColumn(pos,columnPtr)) { - this->m_ColumnPtrs.Add(columnPtr); + m_ColumnPtrs.Add(columnPtr); // if the insertion in the native control is successful the rest can also be initialized: if (dataViewWidgetPtr->InsertColumn(pos,columnPtr)) { // make sure that the data is up-to-date... // if the newly appended column is the first column add the initial data to the control and mark the column as an expander column, // otherwise ask the control to 'update' the data in the newly appended column: - if (this->GetColumnCount() == 1) - this->SetExpanderColumn(columnPtr); + if (GetColumnCount() == 1) + SetExpanderColumn(columnPtr); // done: return true; } else { // clean-up: - this->m_ColumnPtrs.Remove(columnPtr); + m_ColumnPtrs.Remove(columnPtr); delete columnPtr; // and send a message in debug mode: wxFAIL_MSG(_("Column could not be added to native control.")); @@ -429,9 +429,9 @@ bool wxDataViewCtrl::InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr) bool wxDataViewCtrl::ClearColumns() { - if (this->GetDataViewPeer()->ClearColumns()) + if (GetDataViewPeer()->ClearColumns()) { - WX_CLEAR_ARRAY(this->m_ColumnPtrs); + WX_CLEAR_ARRAY(m_ColumnPtrs); return true; } else @@ -440,9 +440,9 @@ bool wxDataViewCtrl::ClearColumns() bool wxDataViewCtrl::DeleteColumn(wxDataViewColumn* columnPtr) { - if (this->GetDataViewPeer()->DeleteColumn(columnPtr)) + if (GetDataViewPeer()->DeleteColumn(columnPtr)) { - this->m_ColumnPtrs.Remove(columnPtr); + m_ColumnPtrs.Remove(columnPtr); delete columnPtr; return true; } @@ -452,57 +452,57 @@ bool wxDataViewCtrl::DeleteColumn(wxDataViewColumn* columnPtr) wxDataViewColumn* wxDataViewCtrl::GetColumn(unsigned int pos) const { - return this->GetDataViewPeer()->GetColumn(pos); + return GetDataViewPeer()->GetColumn(pos); } unsigned int wxDataViewCtrl::GetColumnCount() const { - return this->m_ColumnPtrs.GetCount(); + return m_ColumnPtrs.GetCount(); } int wxDataViewCtrl::GetColumnPosition(wxDataViewColumn const* columnPtr) const { - return this->GetDataViewPeer()->GetColumnPosition(columnPtr); + return GetDataViewPeer()->GetColumnPosition(columnPtr); } void wxDataViewCtrl::Collapse(wxDataViewItem const& item) { - this->GetDataViewPeer()->Collapse(item); + GetDataViewPeer()->Collapse(item); } void wxDataViewCtrl::EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) { if (item.IsOk()) { - this->ExpandAncestors(item); // make sure that the item exists in the control - this->GetDataViewPeer()->EnsureVisible(item,columnPtr); + ExpandAncestors(item); // make sure that the item exists in the control + GetDataViewPeer()->EnsureVisible(item,columnPtr); } } void wxDataViewCtrl::Expand(wxDataViewItem const& item) { - return this->GetDataViewPeer()->Expand(item); + return GetDataViewPeer()->Expand(item); } bool wxDataViewCtrl::IsExpanded( const wxDataViewItem & item ) const { - return (item.IsOk() && this->GetDataViewPeer()->IsExpanded(item)); + return (item.IsOk() && GetDataViewPeer()->IsExpanded(item)); } wxDataViewColumn* wxDataViewCtrl::GetSortingColumn() const { - return this->GetDataViewPeer()->GetSortingColumn(); + return GetDataViewPeer()->GetSortingColumn(); } unsigned int wxDataViewCtrl::GetCount() const { - return this->GetDataViewPeer()->GetCount(); + return GetDataViewPeer()->GetCount(); } wxRect wxDataViewCtrl::GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const { if (item.IsOk() && (columnPtr != NULL)) - return this->GetDataViewPeer()->GetRectangle(item,columnPtr); + return GetDataViewPeer()->GetRectangle(item,columnPtr); else return wxRect(); } @@ -512,7 +512,7 @@ wxDataViewItem wxDataViewCtrl::GetSelection() const wxDataViewItemArray itemIDs; - if (this->GetDataViewPeer()->GetSelections(itemIDs) > 0) + if (GetDataViewPeer()->GetSelections(itemIDs) > 0) return itemIDs[0]; else return wxDataViewItem(); @@ -520,31 +520,31 @@ wxDataViewItem wxDataViewCtrl::GetSelection() const int wxDataViewCtrl::GetSelections(wxDataViewItemArray& sel) const { - return this->GetDataViewPeer()->GetSelections(sel); + return GetDataViewPeer()->GetSelections(sel); } void wxDataViewCtrl::HitTest(wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const { - return this->GetDataViewPeer()->HitTest(point,item,columnPtr); + return GetDataViewPeer()->HitTest(point,item,columnPtr); } bool wxDataViewCtrl::IsSelected(wxDataViewItem const& item) const { - return this->GetDataViewPeer()->IsSelected(item); + return GetDataViewPeer()->IsSelected(item); } void wxDataViewCtrl::Select(wxDataViewItem const& item) { if (item.IsOk()) { - this->ExpandAncestors(item); // make sure that the item exists in the control - this->GetDataViewPeer()->Select(item); + ExpandAncestors(item); // make sure that the item exists in the control + GetDataViewPeer()->Select(item); } } -void wxDataViewCtrl::SelectAll(void) +void wxDataViewCtrl::SelectAll() { - this->GetDataViewPeer()->SelectAll(); + GetDataViewPeer()->SelectAll(); } void wxDataViewCtrl::SetSelections(wxDataViewItemArray const& sel) @@ -560,15 +560,15 @@ void wxDataViewCtrl::SetSelections(wxDataViewItemArray const& sel) for (i = 0; i < noOfSelections; i++) { wxDataViewItem item = sel[i]; - wxDataViewItem parent = this->GetModel()->GetParent( item ); + wxDataViewItem parent = GetModel()->GetParent( item ); if (parent.IsOk() && (parent != last_parent)) - this->ExpandAncestors(item); + ExpandAncestors(item); last_parent = parent; } // finally select the items: - wxDataViewWidgetImpl* dataViewWidgetPtr(this->GetDataViewPeer()); // variable definition for abbreviational purposes + wxDataViewWidgetImpl* dataViewWidgetPtr(GetDataViewPeer()); // variable definition for abbreviational purposes for (i=0; iSelect(sel[i]); @@ -577,20 +577,20 @@ void wxDataViewCtrl::SetSelections(wxDataViewItemArray const& sel) void wxDataViewCtrl::Unselect(wxDataViewItem const& item) { if (item.IsOk()) - this->GetDataViewPeer()->Unselect(item); + GetDataViewPeer()->Unselect(item); } -void wxDataViewCtrl::UnselectAll(void) +void wxDataViewCtrl::UnselectAll() { - this->GetDataViewPeer()->UnselectAll(); + GetDataViewPeer()->UnselectAll(); } // // implementation // -wxDataViewWidgetImpl* wxDataViewCtrl::GetDataViewPeer(void) const +wxDataViewWidgetImpl* wxDataViewCtrl::GetDataViewPeer() const { - return dynamic_cast(this->GetPeer()); + return dynamic_cast(GetPeer()); } void wxDataViewCtrl::AddChildren(wxDataViewItem const& parentItem) @@ -600,18 +600,18 @@ void wxDataViewCtrl::AddChildren(wxDataViewItem const& parentItem) wxDataViewItemArray items; - wxCHECK_RET(this->GetModel() != NULL,_("Model pointer not initialized.")); - noOfChildren = this->GetModel()->GetChildren(parentItem,items); - (void) this->GetModel()->ItemsAdded(parentItem,items); + wxCHECK_RET(GetModel() != NULL,_("Model pointer not initialized.")); + noOfChildren = GetModel()->GetChildren(parentItem,items); + (void) GetModel()->ItemsAdded(parentItem,items); } -void wxDataViewCtrl::FinishCustomItemEditing(void) +void wxDataViewCtrl::FinishCustomItemEditing() { - if (this->GetCustomRendererItem().IsOk()) + if (GetCustomRendererItem().IsOk()) { - this->GetCustomRendererPtr()->FinishEditing(); - this->SetCustomRendererItem(wxDataViewItem()); - this->SetCustomRendererPtr (NULL); + GetCustomRendererPtr()->FinishEditing(); + SetCustomRendererItem(wxDataViewItem()); + SetCustomRendererPtr (NULL); } } @@ -631,25 +631,25 @@ wxDataViewCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) // inherited methods from wxDataViewCtrlBase void wxDataViewCtrl::DoSetExpanderColumn() { - if (this->GetExpanderColumn() != NULL) - this->GetDataViewPeer()->DoSetExpanderColumn(this->GetExpanderColumn()); + if (GetExpanderColumn() != NULL) + GetDataViewPeer()->DoSetExpanderColumn(GetExpanderColumn()); } void wxDataViewCtrl::DoSetIndent() { - this->GetDataViewPeer()->DoSetIndent(this->GetIndent()); + GetDataViewPeer()->DoSetIndent(GetIndent()); } // event handling: void wxDataViewCtrl::OnSize(wxSizeEvent& event) { - unsigned int const noOfColumns = this->GetColumnCount(); + unsigned int const noOfColumns = GetColumnCount(); // reset DC of all custom renderers because DC has changed: for (unsigned int i=0; iGetColumn(i)); + wxDataViewColumn* dataViewColumnPtr(GetColumn(i)); if (dataViewColumnPtr != NULL) { @@ -661,7 +661,7 @@ void wxDataViewCtrl::OnSize(wxSizeEvent& event) } // update the layout of the native control after a size event: - this->GetDataViewPeer()->OnSize(); + GetDataViewPeer()->OnSize(); event.Skip(); } -- 2.47.2