using common code

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 022ff17bd52425a8cced69dfdfcdfa54cd495d79..01dfc25dc433e6af9944d02d55ed4df8fcd4bd81 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -210,6 +210,9 @@ public:
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
                          unsigned int column, bool ascending );
     virtual bool HasDefaultCompare() const { return false; }
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
                          unsigned int column, bool ascending );
     virtual bool HasDefaultCompare() const { return false; }

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

 
 protected:
     // the user should not delete this class directly: he should use DecRef() instead!
 
 protected:
     // the user should not delete this class directly: he should use DecRef() instead!


@@ -228,8 +231,6 @@ public:
     wxDataViewIndexListModel( unsigned int initial_size = 0 );
     ~wxDataViewIndexListModel();
 
     wxDataViewIndexListModel( unsigned int initial_size = 0 );
     ~wxDataViewIndexListModel();
 

-    virtual unsigned int GetRowCount() = 0;
-

     virtual void GetValue( wxVariant &variant,
                            unsigned int row, unsigned int col ) const = 0;
 
     virtual void GetValue( wxVariant &variant,
                            unsigned int row, unsigned int col ) const = 0;
 


@@ -255,7 +256,7 @@ public:
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
                          unsigned int column, bool ascending );
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
                          unsigned int column, bool ascending );

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

 
     // implement base methods
 
 
     // implement base methods
 


@@ -268,9 +269,15 @@ public:
     virtual bool IsContainer( const wxDataViewItem &item ) const;
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
 
     virtual bool IsContainer( const wxDataViewItem &item ) const;
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
 

+    // internal
+    virtual bool IsIndexListModel() const { return true; }
+    unsigned int GetLastIndex() const { return m_lastIndex; }
+    

 private:
     wxDataViewItemArray m_hash;
     unsigned int m_lastIndex;
 private:
     wxDataViewItemArray m_hash;
     unsigned int m_lastIndex;

+    bool m_ordered;
+    bool m_useHash;

 };
 
 
 };
 
 


@@ -467,8 +474,8 @@ public:
     const wxBitmap &GetBitmap() const       { return m_bitmap; }
     unsigned int GetModelColumn() const     { return static_cast<unsigned int>(m_model_column); }
 
     const wxBitmap &GetBitmap() const       { return m_bitmap; }
     unsigned int GetModelColumn() const     { return static_cast<unsigned int>(m_model_column); }
 

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

 
 protected:
     wxDataViewRenderer      *m_renderer;
 
 protected:
     wxDataViewRenderer      *m_renderer;


@@ -908,7 +915,7 @@ public:
     virtual unsigned int GetColumnCount() const
         { return 1; };
     virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const
     virtual unsigned int GetColumnCount() const
         { return 1; };
     virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const

-        { return "wxDataViewIconText"; }
+        { return wxT("wxDataViewIconText"); }

 
     wxDataViewTreeStoreNode *FindNode( const wxDataViewItem &item ) const;
     wxDataViewTreeStoreContainerNode *FindContainerNode( const wxDataViewItem &item ) const;
 
     wxDataViewTreeStoreNode *FindNode( const wxDataViewItem &item ) const;
     wxDataViewTreeStoreContainerNode *FindContainerNode( const wxDataViewItem &item ) const;