X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/453091c26978d6da004ab46c78c719d7f9444ae3..15041ff9c88a55041f91e04d8019c38e8e188b05:/include/wx/mac/carbon/dataview.h

diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h
index 2de8f843a9..24a5a673af 100644
--- a/include/wx/mac/carbon/dataview.h
+++ b/include/wx/mac/carbon/dataview.h
@@ -7,29 +7,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MACCARBONDATAVIEWCTRL_H__
-#define __MACCARBONDATAVIEWCTRL_H__
+#ifndef _WX_MACCARBONDATAVIEWCTRL_H_
+#define _WX_MACCARBONDATAVIEWCTRL_H_
 
-#include <Carbon/carbon.h>
+// --------------------------------------------------------
+// Type definitions to mask native types
+// --------------------------------------------------------
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-#include "wx/scrolwin.h"
-#include "wx/icon.h"
-
-// ---------------------------------------------------------
-// classes
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
+typedef void*         WXDataBrowserItemDataRef;
+typedef unsigned long WXDataBrowserPropertyType;
+typedef wxUint32      WXDataBrowserPropertyID;
 
 // ---------------------------------------------------------
 // wxDataViewRenderer
 // ---------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase
+class WXDLLIMPEXP_ADV wxDataViewRenderer : public wxDataViewRendererBase
 {
 public:
 //
@@ -67,7 +60,7 @@ public:
 //
 // implementation
 //
-  DataBrowserItemDataRef GetDataReference(void) const
+  WXDataBrowserItemDataRef GetDataReference(void) const
   {
     return this->m_dataReference;
   }
@@ -76,12 +69,12 @@ public:
     return this->m_value;
   }
 
-  virtual DataBrowserPropertyType GetPropertyType(void) const = 0;
+  virtual WXDataBrowserPropertyType GetPropertyType(void) const = 0;
 
   virtual bool Render(void) = 0; // a call to the appropriate data browser function filling the data reference with the stored datum;
                                  // returns 'true' if the data value could be rendered, 'false' otherwise
 
-  void SetDataReference(DataBrowserItemDataRef const& newDataReference)
+  void SetDataReference(WXDataBrowserItemDataRef const& newDataReference)
   {
     this->m_dataReference = newDataReference;
   }
@@ -90,7 +83,7 @@ private:
 //
 // variables
 //
-  DataBrowserItemDataRef m_dataReference; // data reference of the data browser; the data will be assigned to this reference during rendering
+  WXDataBrowserItemDataRef m_dataReference; // data reference of the data browser; the data will be assigned to this reference during rendering
 
   int m_alignment; // contains the alignment flags
 
@@ -118,6 +111,8 @@ public:
   
   virtual ~wxDataViewCustomRenderer(void);
 
+  void RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state );
+
 //
 // methods handling render space
 //
@@ -179,7 +174,7 @@ public:
     return false;
   }
 
-  virtual bool StartEditing(const wxDataViewItem &WXUNUSED(item), wxRect WXUNUSED(labelRect)) 
+  virtual bool StartEditing(wxDataViewItem const& WXUNUSED(item), wxRect WXUNUSED(labelRect)) 
   {
     return false;
   }
@@ -195,10 +190,7 @@ public:
   virtual bool Render(void); // declared in wxDataViewRenderer but will not be used here, therefore calling this function will
                              // return 'true' without having done anything
 
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserCustomType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType(void) const;
 
   void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
 
@@ -237,16 +229,29 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserTextType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType(void) const;
 
 protected:
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
 };
 
+// ---------------------------------------------------------
+// wxDataViewTextRendererAttr
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewTextRendererAttr: public wxDataViewTextRenderer
+{
+public:
+//
+// constructors / destructor
+//
+    wxDataViewTextRendererAttr(wxString const& varianttype=wxT("string"), wxDataViewCellMode mode=wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT);
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRendererAttr)
+};
+
 // ---------------------------------------------------------
 // wxDataViewBitmapRenderer
 // ---------------------------------------------------------
@@ -267,10 +272,7 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserIconType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType(void) const;
 
 protected:
 private:
@@ -294,10 +296,7 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserIconAndTextType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType(void) const;
   
 protected:
 private:
@@ -321,10 +320,7 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserCheckboxType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType(void) const;
 
 protected:
 private:
@@ -349,10 +345,7 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserProgressBarType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType(void) const;
 
 protected:
 private:
@@ -376,10 +369,7 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserDateTimeType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType(void) const;
 
 protected:
 private:
@@ -463,15 +453,19 @@ public:
 //
 // implementation
 //
-  DataBrowserPropertyID GetPropertyID(void) const
+  WXDataBrowserPropertyID GetPropertyID() const
   {
     return this->m_propertyID;
   }
   
-  void SetPropertyID(DataBrowserPropertyID newID)
+  void SetPropertyID(WXDataBrowserPropertyID newID)
   {
     this->m_propertyID = newID;
   }
+  void SetWidthVariable(int NewWidth)
+  {
+    this->m_width = NewWidth;
+  }
 
 protected:
 private:
@@ -480,7 +474,7 @@ private:
 //
   bool m_ascending; // sorting order
 
-  DataBrowserPropertyID m_propertyID; // each column is identified by its unique property ID (NOT by the column index)
+  WXDataBrowserPropertyID m_propertyID; // each column is identified by its unique property ID (NOT by the column index)
   
   int m_flags;    // flags for the column
   int m_maxWidth; // maximum width for the column
@@ -530,13 +524,15 @@ public:
   virtual bool DeleteColumn(wxDataViewColumn* columnPtr);
   virtual wxDataViewColumn* GetColumn(unsigned int pos) const;
   virtual unsigned int GetColumnCount(void) const;
-    virtual int GetColumnPosition( const wxDataViewColumn *column ) const;
-    virtual wxDataViewColumn *GetSortingColumn() const;
+  virtual int GetColumnPosition(wxDataViewColumn const* columnPtr) const;
+  virtual bool PrependColumn(wxDataViewColumn* columnPtr);
 
   virtual void Collapse(wxDataViewItem const& item);
   virtual void EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr=NULL);
   virtual void Expand(wxDataViewItem const& item);
   
+  virtual wxDataViewColumn* GetSortingColumn(void) const;
+
   virtual unsigned int GetCount(void) const;
   virtual wxRect GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const;
   virtual wxDataViewItem GetSelection(void) const;
@@ -562,7 +558,7 @@ public:
 
  // returns a pointer to a column;
  // in case the pointer cannot be found NULL is returned:
-  wxDataViewColumn* GetColumnPtr(DataBrowserPropertyID propertyID) const;
+  wxDataViewColumn* GetColumnPtr(WXDataBrowserPropertyID propertyID) const;
 
  // checks if currently a delete process is running:
   bool IsDeleting(void) const
@@ -599,7 +595,7 @@ protected:
 
 private:
  // type definitions:
-  WX_DECLARE_HASH_MAP(DataBrowserPropertyID,wxDataViewColumn*,wxIntegerHash,wxIntegerEqual,ColumnPointerHashMapType);
+  WX_DECLARE_HASH_MAP(WXDataBrowserPropertyID,wxDataViewColumn*,wxIntegerHash,wxIntegerEqual,ColumnPointerHashMapType);
 
  // initializing of local variables:
   void Init(void);
@@ -623,4 +619,4 @@ private:
 };
 
 
-#endif // __MACDATAVIEWCTRL_H__
+#endif // _WX_MACCARBONDATAVIEWCTRL_H_