Make storing non-trivial data in wxThreadSpecificInfo possible.

[wxWidgets.git] / include / wx / osx / dvrenderers.h

diff --git a/include/wx/osx/dvrenderers.h b/include/wx/osx/dvrenderers.h
index c2b0765ef8e3ca941724ef6f6592cf3569b8965f..d046b1a851fba0e38846d7d34a6e80366d7bd6f4 100644 (file)
--- a/include/wx/osx/dvrenderers.h
+++ b/include/wx/osx/dvrenderers.h
@@ -3,7 +3,6 @@
 // Purpose:     All OS X wxDataViewCtrl renderer classes
 // Author:      Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/osx/dataview.h)
 // Purpose:     All OS X wxDataViewCtrl renderer classes
 // Author:      Vadim Zeitlin
 // Created:     2009-11-07 (extracted from wx/osx/dataview.h)

-// RCS-ID:      $Id: wxhead.h,v 1.11 2009-06-29 10:23:04 zeitlin Exp $

 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -30,6 +29,10 @@ public:
 
     virtual bool MacRender();
 
 
     virtual bool MacRender();
 

+#if wxOSX_USE_COCOA
+    virtual void OSXApplyAttr(const wxDataViewItemAttr& attr);
+#endif // Cocoa
+

     virtual wxDC* GetDC(); // creates a device context and keeps it
     void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
 
     virtual wxDC* GetDC(); // creates a device context and keeps it
     void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
 


@@ -54,9 +57,11 @@ public:
 
     virtual bool MacRender();
 
 
     virtual bool MacRender();
 

+#if wxOSX_USE_COCOA

     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
                                   unsigned col);
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
                                   unsigned col);

+#endif // Cocoa

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)


@@ -79,6 +84,8 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
 };
 

+#if wxOSX_USE_COCOA
+

 // -------------------------------------
 // wxDataViewChoiceRenderer
 // -------------------------------------
 // -------------------------------------
 // wxDataViewChoiceRenderer
 // -------------------------------------


@@ -95,12 +102,20 @@ public:
     wxString GetChoice(size_t index) const { return m_choices[index]; }
     const wxArrayString& GetChoices() const { return m_choices; }
 
     wxString GetChoice(size_t index) const { return m_choices[index]; }
     const wxArrayString& GetChoices() const { return m_choices; }
 

+#if wxOSX_USE_COCOA
+    virtual void OSXOnCellChanged(NSObject *value,
+                                  const wxDataViewItem& item,
+                                  unsigned col);
+#endif // Cocoa
+

 private:
     wxArrayString m_choices;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewChoiceRenderer)
 };
 
 private:
     wxArrayString m_choices;
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewChoiceRenderer)
 };
 

+#endif // wxOSX_USE_COCOA
+

 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewIconTextRenderer
 // ---------------------------------------------------------


@@ -113,9 +128,11 @@ public:
 
     virtual bool MacRender();
 
 
     virtual bool MacRender();
 

+#if wxOSX_USE_COCOA

     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
                                   unsigned col);
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
                                   unsigned col);

+#endif // Cocoa

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)


@@ -134,9 +151,11 @@ public:
 
     virtual bool MacRender();
 
 
     virtual bool MacRender();
 

+#if wxOSX_USE_COCOA

     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
                                   unsigned col);
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
                                   unsigned col);

+#endif // Cocoa

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)


@@ -156,9 +175,11 @@ public:
 
     virtual bool MacRender();
 
 
     virtual bool MacRender();
 

+#if wxOSX_USE_COCOA

     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
                                   unsigned col);
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
                                   unsigned col);

+#endif // Cocoa

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)


@@ -177,9 +198,11 @@ public:
 
     virtual bool MacRender();
 
 
     virtual bool MacRender();
 

+#if wxOSX_USE_COCOA

     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
                                   unsigned col);
     virtual void OSXOnCellChanged(NSObject *value,
                                   const wxDataViewItem& item,
                                   unsigned col);

+#endif // Cocoa

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)