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

No real changes, just minor cleanup in Cocoa wxDataViewCtrl.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2009-10-12 13:59:32 +00:00
parent 2d0d781336
commit de40d73647
6 changed files with 676 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
include/wx/osx/carbon/dataview.h
View File

@@ -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<wxDataViewCtrl*>(this->GetWXPeer());
return dynamic_cast<wxDataViewCtrl*>(GetWXPeer());
}
protected:

68
include/wx/osx/cocoa/dataview.h
View File

@@ -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<wxDataViewCtrl*>(this->GetWXPeer());
return dynamic_cast<wxDataViewCtrl*>(GetWXPeer());
}
//

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

@@ -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