use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is...

[wxWidgets.git] / include / wx / dataview.h

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 9ae9ba9d7775f9c83e382d011f900255bc7b5154..63e2f6460b1f84d1d3eef0a88a1d28c5200fb74f 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -27,8 +27,8 @@
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 

-#if !(defined(__WXGTK20__) || defined(__WXOSX_CARBON__)) || defined(__WXUNIVERSAL__)
-// #if !(defined(__WXMAC__)) || defined(__WXUNIVERSAL__)
+#if !(defined(__WXGTK20__) || defined(__WXOSX__)) || defined(__WXUNIVERSAL__)
+// #if !(defined(__WXOSX__)) || defined(__WXUNIVERSAL__)

     #define wxHAS_GENERIC_DATAVIEWCTRL
 #endif
 
     #define wxHAS_GENERIC_DATAVIEWCTRL
 #endif
 


@@ -81,10 +81,6 @@ public:
     void* GetID() const                { return m_id; }
     operator const void* () const      { return m_id; }
 
     void* GetID() const                { return m_id; }
     operator const void* () const      { return m_id; }
 

-#ifdef __WXDEBUG__
-    void Print( const wxString &text ) const;
-#endif
-

 private:
     void* m_id;
 };
 private:
     void* m_id;
 };


@@ -165,7 +161,7 @@ private:
 WX_DECLARE_LIST_WITH_DECL(wxDataViewModelNotifier, wxDataViewModelNotifiers,
                           class WXDLLIMPEXP_ADV);
 
 WX_DECLARE_LIST_WITH_DECL(wxDataViewModelNotifier, wxDataViewModelNotifiers,
                           class WXDLLIMPEXP_ADV);
 

-class WXDLLIMPEXP_ADV wxDataViewModel: public wxObjectRefData
+class WXDLLIMPEXP_ADV wxDataViewModel: public wxRefCounter

 {
 public:
     wxDataViewModel();
 {
 public:
     wxDataViewModel();


@@ -213,7 +209,7 @@ public:
 
     // default compare function
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
 
     // default compare function
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,

-                         unsigned int column, bool ascending );
+                         unsigned int column, bool ascending ) const;

     virtual bool HasDefaultCompare() const { return false; }
 
     // internal
     virtual bool HasDefaultCompare() const { return false; }
 
     // internal


@@ -262,7 +258,7 @@ public:
     // compare based on index
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
     // compare based on index
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,

-                         unsigned int column, bool ascending );
+                         unsigned int column, bool ascending ) const;

     virtual bool HasDefaultCompare() const;
 
     // implement base methods
     virtual bool HasDefaultCompare() const;
 
     // implement base methods


@@ -327,7 +323,7 @@ public:
     // compare based on index
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
     // compare based on index
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,

-                         unsigned int column, bool ascending );
+                         unsigned int column, bool ascending ) const;

     virtual bool HasDefaultCompare() const;
 
     // implement base methods
     virtual bool HasDefaultCompare() const;
 
     // implement base methods


@@ -529,8 +525,7 @@ public:
         { m_owner = owner; }
 
     // getters:
         { m_owner = owner; }
 
     // getters:

-    unsigned int GetModelColumn() const 
-        { return static_cast<unsigned int>(m_model_column); }
+    unsigned int GetModelColumn() const { return static_cast<unsigned int>(m_model_column); }

     wxDataViewCtrl *GetOwner() const        { return m_owner; }
     wxDataViewRenderer* GetRenderer() const { return m_renderer; }
 
     wxDataViewCtrl *GetOwner() const        { return m_owner; }
     wxDataViewRenderer* GetRenderer() const { return m_renderer; }
 


@@ -933,7 +928,7 @@ private:
     long    m_min,m_max;
 };
 
     long    m_min,m_max;
 };
 

-#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXMAC__)
+#if defined(wxHAS_GENERIC_DATAVIEWCTRL) || defined(__WXOSX_CARBON__)

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


@@ -1229,7 +1224,7 @@ public:
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,

-                         unsigned int column, bool ascending );
+                         unsigned int column, bool ascending ) const;

 
     virtual bool HasDefaultCompare() const
         { return true; }
 
     virtual bool HasDefaultCompare() const
         { return true; }