X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d9ecc870ac0240b625c7a1315d2091a0f8af7d3..50f8c98e06db4ab6e9752aa12cc86ee989ae9dd4:/include/wx/mac/carbon/dataview.h

diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h
index b6b22b356f..67b17836cd 100644
--- a/include/wx/mac/carbon/dataview.h
+++ b/include/wx/mac/carbon/dataview.h
@@ -7,23 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MACCARBONDATAVIEWCTRL_H__
-#define __MACCARBONDATAVIEWCTRL_H__
+#ifndef _WX_MACCARBONDATAVIEWCTRL_H_
+#define _WX_MACCARBONDATAVIEWCTRL_H_
 
-#include <Carbon/carbon.h>
-
-#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* DataBrowserItemDataRef;
+typedef unsigned long WXDataBrowserPropertyType;
+typedef wxUint32 WXDataBrowserPropertyID;
 
 // ---------------------------------------------------------
 // wxDataViewRenderer
@@ -76,7 +65,7 @@ public:
     return this->m_value;
   }
 
-  virtual DataBrowserPropertyType GetPropertyType(void) const = 0;
+  virtual WXDataBrowserPropertyType GetPropertyType() 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
@@ -118,6 +107,8 @@ public:
   
   virtual ~wxDataViewCustomRenderer(void);
 
+  void RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state );
+
 //
 // methods handling render space
 //
@@ -195,10 +186,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() const;
 
   void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
 
@@ -237,16 +225,29 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserTextType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType() 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 +268,7 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserIconType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType() const;
 
 protected:
 private:
@@ -294,10 +292,7 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserIconAndTextType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType() const;
   
 protected:
 private:
@@ -321,10 +316,7 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserCheckboxType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType() const;
 
 protected:
 private:
@@ -349,10 +341,7 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserProgressBarType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType() const;
 
 protected:
 private:
@@ -376,10 +365,7 @@ public:
 //
 // implementation
 //
-  virtual DataBrowserPropertyType GetPropertyType(void) const
-  {
-    return kDataBrowserDateTimeType;
-  }
+  virtual WXDataBrowserPropertyType GetPropertyType() const;
 
 protected:
 private:
@@ -463,12 +449,12 @@ 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;
   }
@@ -484,7 +470,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
@@ -567,7 +553,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
@@ -604,7 +590,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);
@@ -628,4 +614,4 @@ private:
 };
 
 
-#endif // __MACDATAVIEWCTRL_H__
+#endif // _WX_MACCARBONDATAVIEWCTRL_H_