Patch from Hartwig for wxMac implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/mac/carbon/databrow.h

@@ -120,6 +120,7 @@ public:
   OSStatus SetHasScrollBars( bool horiz, bool vert );
   OSStatus SetHeaderButtonHeight( UInt16 height );
   OSStatus SetHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle );
+  OSStatus SetIndent(float Indent);
   OSStatus SetRowHeight( DataBrowserItemID item , UInt16 height);
   OSStatus SetScrollPosition( UInt32 top , UInt32 left );
 
@@ -135,7 +136,8 @@ public:
   
   OSStatus IsUsedPropertyID(DataBrowserPropertyID propertyID) const; // checks if passed property id is used by the control; no error is returned if the id exists
 
-  OSStatus RemoveColumn(DataBrowserTableViewColumnIndex index);
+  OSStatus RemoveColumnByProperty(DataBrowserTableViewColumnID propertyID);
+  OSStatus RemoveColumnByIndex   (DataBrowserTableViewColumnIndex index);
 
   OSStatus SetColumnIndex     (DataBrowserPropertyID propertyID, DataBrowserTableViewColumnIndex index);
   OSStatus SetDisclosureColumn(DataBrowserPropertyID propertyID, Boolean expandableRows=true);
@@ -207,6 +209,13 @@ public:
   OSStatus SetSortOrder   (DataBrowserSortOrder  order);
   OSStatus SetSortProperty(DataBrowserPropertyID propertyID);
 
+//
+// container handling
+//
+  OSStatus CloseContainer(DataBrowserItemID containerID);
+  
+  OSStatus OpenContainer(DataBrowserItemID containerID);
+
 protected :
 //
 // callback functions

include/wx/mac/carbon/dataview.h

@@ -193,7 +193,7 @@ public:
 // implementation
 //
   virtual bool Render(void); // declared in wxDataViewRenderer but will not be used here, therefore calling this function will
-                             // return 'false' without having done anything
+                             // return 'true' without having done anything
 
   virtual DataBrowserPropertyType GetPropertyType(void) const
   {
@@ -281,6 +281,33 @@ private:
 // wxDataViewToggleRenderer
 // ---------------------------------------------------------
 
+class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewRenderer
+{
+public:
+  wxDataViewIconTextRenderer(wxString const& varianttype = wxT("wxDataViewIconText"), wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT);
+  
+//
+// inherited functions from wxDataViewRenderer
+//
+  virtual bool Render(void);
+  
+//
+// implementation
+//
+  virtual DataBrowserPropertyType GetPropertyType(void) const
+  {
+    return kDataBrowserIconAndTextType;
+  }
+  
+protected:
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
+};
+
+// ---------------------------------------------------------
+// wxDataViewToggleRenderer
+// ---------------------------------------------------------
+
 class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer
 {
 public:
@@ -490,17 +517,23 @@ public:
   bool Create(wxWindow *parent, wxWindowID id, wxPoint const& pos=wxDefaultPosition, wxSize const& size=wxDefaultSize, long style=0,
               wxValidator const& validator=wxDefaultValidator);
 
- // inherited methods from 'wxDataViewCtrlBase':
-  virtual bool AppendColumn(wxDataViewColumn* columnPtr);
-
-  virtual bool AssociateModel(wxDataViewModel* model);
-
   virtual wxControl* GetMainWindow(void) // should disappear as it is not of any use for the native implementation
   {
     return this;
   }
   
+ // inherited methods from 'wxDataViewCtrlBase':
+  virtual bool AssociateModel(wxDataViewModel* model);
+
+  virtual bool AppendColumn(wxDataViewColumn* columnPtr);
+  virtual bool ClearColumns(void);
+  virtual bool DeleteColumn(wxDataViewColumn* columnPtr);
+  virtual wxDataViewColumn* GetColumn(unsigned int pos) const;
+  virtual unsigned int GetColumnCount(void) const;
+
+  virtual void Collapse(wxDataViewItem const& item);
   virtual void EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr=NULL);
+  virtual void Expand(wxDataViewItem const& item);
   
   virtual wxRect GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const;
   virtual wxDataViewItem GetSelection(void) const;
@@ -516,8 +549,7 @@ public:
 
   virtual void Unselect(wxDataViewItem const& item);
   virtual void UnselectAll(void);
-  
-  
+
 //
 // implementation
 //
@@ -525,6 +557,10 @@ public:
  // adds all children of the passed parent to the control; if 'parentItem' is invalid the root(s) is/are added:
   void AddChildrenLevel(wxDataViewItem const& parentItem);
 
+ // returns a pointer to a column;
+ // in case the pointer cannot be found NULL is returned:
+  wxDataViewColumn* GetColumnPtr(DataBrowserPropertyID propertyID) const;
+
  // checks if currently a delete process is running:
   bool IsDeleting(void) const
   {
@@ -559,6 +595,9 @@ protected:
   void OnSize(wxSizeEvent &event);
 
 private:
+ // type definitions:
+  WX_DECLARE_HASH_MAP(DataBrowserPropertyID,wxDataViewColumn*,wxIntegerHash,wxIntegerEqual,ColumnPointerHashMapType);
+
  // initializing of local variables:
   void Init(void);
 
@@ -572,7 +611,7 @@ private:
 
   void* m_cgContext; // pointer to core graphics context
   
-  wxDataViewModelNotifier* m_NotifierPtr; // the notifier is NOT owned by this class but by the associated model
+  ColumnPointerHashMapType m_ColumnPointers; // all column pointers are stored in a hash map with the property ID as a key
 
  // wxWidget internal stuff:
   DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)