add size parameter to the generic wxFileDialog ctor

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index ff88b737830b681ab76ec35646a5b4bd921e636c..b98220ac3edf2bcfa392e511b1b3674151f4c7bc 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -18,20 +18,19 @@
 
 #include "wx/control.h"
 #include "wx/textctrl.h"
 
 #include "wx/control.h"
 #include "wx/textctrl.h"

-#include "wx/bitmap.h"
+#include "wx/headercol.h"

 #include "wx/variant.h"
 #include "wx/variant.h"

-#include "wx/listctrl.h"

 #include "wx/dynarray.h"
 #include "wx/icon.h"
 #include "wx/dynarray.h"
 #include "wx/icon.h"

+#include "wx/imaglist.h"
+#include "wx/weakref.h"

 
 

-#if defined(__WXGTK20__)
-    // for testing
-    // #define wxUSE_GENERICDATAVIEWCTRL 1
-#elif defined(__WXMAC__)
-#else
-    #define wxUSE_GENERICDATAVIEWCTRL 1
+#if !(defined(__WXGTK20__) || defined(__WXMAC__)) || defined(__WXUNIVERSAL__)
+    #define wxHAS_GENERIC_DATAVIEWCTRL

 #endif
 
 #endif
 

+class WXDLLIMPEXP_FWD_CORE wxDataFormat;
+

 // ----------------------------------------------------------------------------
 // wxDataViewCtrl flags
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxDataViewCtrl flags
 // ----------------------------------------------------------------------------


@@ -47,7 +46,7 @@ class WXDLLIMPEXP_FWD_ADV wxDataViewColumn;
 class WXDLLIMPEXP_FWD_ADV wxDataViewRenderer;
 class WXDLLIMPEXP_FWD_ADV wxDataViewModelNotifier;
 
 class WXDLLIMPEXP_FWD_ADV wxDataViewRenderer;
 class WXDLLIMPEXP_FWD_ADV wxDataViewModelNotifier;
 

-extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const char) wxDataViewCtrlNameStr[];

 
 // the default width of new (text) columns:
 #define wxDVC_DEFAULT_WIDTH             80
 
 // the default width of new (text) columns:
 #define wxDVC_DEFAULT_WIDTH             80


@@ -58,8 +57,9 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[];
 // the default minimal width of the columns:
 #define wxDVC_DEFAULT_MINWIDTH          30
 
 // the default minimal width of the columns:
 #define wxDVC_DEFAULT_MINWIDTH          30
 

-// the default alignment of wxDataViewRenderers:
-#define wxDVR_DEFAULT_ALIGNMENT         (wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL)
+// The default alignment of wxDataViewRenderers is to take
+// the alignment from the column it owns.
+#define wxDVR_DEFAULT_ALIGNMENT         -1

 
 
 // ---------------------------------------------------------
 
 
 // ---------------------------------------------------------


@@ -69,18 +69,18 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[];
 class WXDLLIMPEXP_ADV wxDataViewItem
 {
 public:
 class WXDLLIMPEXP_ADV wxDataViewItem
 {
 public:

-    wxDataViewItem( void* id = NULL ) 
+    wxDataViewItem( void* id = NULL )

         { m_id = id; }
     wxDataViewItem( const wxDataViewItem &item )
         { m_id = item.m_id; }
     bool IsOk() const                  { return m_id != NULL; }
     void* GetID() const                { return m_id; }
     operator const void* () const      { return m_id; }
         { m_id = id; }
     wxDataViewItem( const wxDataViewItem &item )
         { m_id = item.m_id; }
     bool IsOk() const                  { return m_id != NULL; }
     void* GetID() const                { return m_id; }
     operator const void* () const      { return m_id; }

-    
+

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    void Print( const wxString &text ) const  { wxPrintf( "item %s: %d\n", text, (int) m_id ); }
+    void Print( const wxString &text ) const;

 #endif
 #endif

-    
+

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


@@ -96,7 +96,7 @@ WX_DEFINE_ARRAY(wxDataViewItem, wxDataViewItemArray);
 class WXDLLIMPEXP_ADV wxDataViewModelNotifier
 {
 public:
 class WXDLLIMPEXP_ADV wxDataViewModelNotifier
 {
 public:

-    wxDataViewModelNotifier() { }
+    wxDataViewModelNotifier() { m_owner = NULL; }

     virtual ~wxDataViewModelNotifier() { m_owner = NULL; }
 
     virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) = 0;
     virtual ~wxDataViewModelNotifier() { m_owner = NULL; }
 
     virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) = 0;


@@ -107,17 +107,53 @@ public:
     virtual bool ItemsChanged( const wxDataViewItemArray &items );
     virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col ) = 0;
     virtual bool Cleared() = 0;
     virtual bool ItemsChanged( const wxDataViewItemArray &items );
     virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col ) = 0;
     virtual bool Cleared() = 0;

-    
+

     virtual void Resort() = 0;
 
     void SetOwner( wxDataViewModel *owner ) { m_owner = owner; }
     virtual void Resort() = 0;
 
     void SetOwner( wxDataViewModel *owner ) { m_owner = owner; }

-    wxDataViewModel *GetOwner()             { return m_owner; }
+    wxDataViewModel *GetOwner() const       { return m_owner; }

 
 private:
     wxDataViewModel *m_owner;
 };
 
 
 
 private:
     wxDataViewModel *m_owner;
 };
 
 

+
+// ----------------------------------------------------------------------------
+// wxDataViewItemAttr: a structure containing the visual attributes of an item
+// ----------------------------------------------------------------------------
+
+// TODO: this should be renamed to wxItemAttr or something general like this
+
+class WXDLLIMPEXP_ADV wxDataViewItemAttr
+{
+public:
+    // ctors
+    wxDataViewItemAttr()
+    {
+        m_bold = false;
+        m_italic = false;
+    }
+
+    // setters
+    void SetColour(const wxColour& colour) { m_colour = colour; }
+    void SetBold( bool set ) { m_bold = set; }
+    void SetItalic( bool set ) { m_italic = set; }
+
+    // accessors
+    bool HasColour() const { return m_colour.Ok(); }
+    const wxColour& GetColour() const { return m_colour; }
+
+    bool GetBold() const { return m_bold; }
+    bool GetItalic() const { return m_italic; }
+
+private:
+    wxColour m_colour;
+    bool     m_bold;
+    bool     m_italic;
+};
+
+

 // ---------------------------------------------------------
 // wxDataViewModel
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 // wxDataViewModel
 // ---------------------------------------------------------


@@ -136,20 +172,34 @@ public:
     virtual wxString GetColumnType( unsigned int col ) const = 0;
 
     // get value into a wxVariant
     virtual wxString GetColumnType( unsigned int col ) const = 0;
 
     // get value into a wxVariant

-    virtual void GetValue( wxVariant &variant, 
+    virtual void GetValue( wxVariant &variant,

                            const wxDataViewItem &item, unsigned int col ) const = 0;
 
     // set value, call ValueChanged() afterwards!
                            const wxDataViewItem &item, unsigned int col ) const = 0;
 
     // set value, call ValueChanged() afterwards!

-    virtual bool SetValue( const wxVariant &variant, 
+    virtual bool SetValue( const wxVariant &variant,

                            const wxDataViewItem &item, unsigned int col ) = 0;
 
                            const wxDataViewItem &item, unsigned int col ) = 0;
 

+    // Get text attribute, return false of default attributes should be used
+    virtual bool GetAttr( const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col), wxDataViewItemAttr &WXUNUSED(attr) )
+        { return false; }
+

     // define hierachy
     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const = 0;
     virtual bool IsContainer( const wxDataViewItem &item ) const = 0;
     // Is the container just a header or an item with all columns
     // define hierachy
     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const = 0;
     virtual bool IsContainer( const wxDataViewItem &item ) const = 0;
     // Is the container just a header or an item with all columns

-    virtual bool HasContainerColumns( const wxDataViewItem &item ) const { return false; }
+    virtual bool HasContainerColumns(const wxDataViewItem& WXUNUSED(item)) const
+        { return false; }

     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const = 0;
 
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const = 0;
 

+    // define DnD capabilities
+    virtual bool IsDraggable( const wxDataViewItem &WXUNUSED(item) )
+        { return false; }
+    virtual size_t GetDragDataSize( const wxDataViewItem &WXUNUSED(item), const wxDataFormat &WXUNUSED(format) )
+        { return 0; }
+    virtual bool GetDragData( const wxDataViewItem &WXUNUSED(item), const wxDataFormat &WXUNUSED(format),
+                              void* WXUNUSED(data), size_t WXUNUSED(size) )
+        { return FALSE; }
+

     // delegated notifiers
     virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     virtual bool ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items );
     // delegated notifiers
     virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     virtual bool ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items );


@@ -165,12 +215,15 @@ public:
 
     void AddNotifier( wxDataViewModelNotifier *notifier );
     void RemoveNotifier( wxDataViewModelNotifier *notifier );
 
     void AddNotifier( wxDataViewModelNotifier *notifier );
     void RemoveNotifier( wxDataViewModelNotifier *notifier );

-    
+

     // default compare function
     // default compare function

-    virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, 
+    virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,

                          unsigned int column, bool ascending );
     virtual bool HasDefaultCompare() const { return false; }
 
                          unsigned int column, bool ascending );
     virtual bool HasDefaultCompare() const { return false; }
 

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

 protected:
     // the user should not delete this class directly: he should use DecRef() instead!
     virtual ~wxDataViewModel() { }
 protected:
     // the user should not delete this class directly: he should use DecRef() instead!
     virtual ~wxDataViewModel() { }


@@ -187,48 +240,122 @@ class WXDLLIMPEXP_ADV wxDataViewIndexListModel: public wxDataViewModel
 public:
     wxDataViewIndexListModel( unsigned int initial_size = 0 );
     ~wxDataViewIndexListModel();
 public:
     wxDataViewIndexListModel( unsigned int initial_size = 0 );
     ~wxDataViewIndexListModel();

-    
-    virtual unsigned int GetRowCount() = 0;
-    
-    virtual void GetValue( wxVariant &variant, 
+
+    virtual void GetValue( wxVariant &variant,

                            unsigned int row, unsigned int col ) const = 0;
 
                            unsigned int row, unsigned int col ) const = 0;
 

-    virtual bool SetValue( const wxVariant &variant, 
+    virtual bool SetValue( const wxVariant &variant,

                            unsigned int row, unsigned int col ) = 0;
                            unsigned int row, unsigned int col ) = 0;

-    
+
+    virtual bool GetAttr( unsigned int WXUNUSED(row), unsigned int WXUNUSED(col), wxDataViewItemAttr &WXUNUSED(attr) )
+        { return false; }
+

     void RowPrepended();
     void RowInserted( unsigned int before );
     void RowAppended();
     void RowDeleted( unsigned int row );
     void RowPrepended();
     void RowInserted( unsigned int before );
     void RowAppended();
     void RowDeleted( unsigned int row );

+    void RowsDeleted( const wxArrayInt &rows );

     void RowChanged( unsigned int row );
     void RowValueChanged( unsigned int row, unsigned int col );
     void RowChanged( unsigned int row );
     void RowValueChanged( unsigned int row, unsigned int col );

-    
+    void Reset( unsigned int new_size );
+

     // convert to/from row/wxDataViewItem
     // convert to/from row/wxDataViewItem

-    
+

     unsigned int GetRow( const wxDataViewItem &item ) const;
     wxDataViewItem GetItem( unsigned int row ) const;
     unsigned int GetRow( const wxDataViewItem &item ) const;
     wxDataViewItem GetItem( unsigned int row ) const;

-    
+

     // compare based on index
     // compare based on index

-    
-    virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, 
+
+    virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,

                          unsigned int column, bool ascending );
                          unsigned int column, bool ascending );

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

 
     // implement base methods
 
 
     // implement base methods
 

-    virtual void GetValue( wxVariant &variant, 
+    virtual void GetValue( wxVariant &variant,

                            const wxDataViewItem &item, unsigned int col ) const;
                            const wxDataViewItem &item, unsigned int col ) const;

-    virtual bool SetValue( const wxVariant &variant, 
+    virtual bool SetValue( const wxVariant &variant,

                            const wxDataViewItem &item, unsigned int col );
                            const wxDataViewItem &item, unsigned int col );

+    virtual bool GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr );

     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const;
     virtual bool IsContainer( const wxDataViewItem &item ) const;
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const;
     virtual bool IsContainer( const wxDataViewItem &item ) const;
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;

-    
+
+    // internal
+    virtual bool IsVirtualListModel() const { return false; }
+    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;

 };
 
 };
 

+// ---------------------------------------------------------
+// wxDataViewVirtualListModel
+// ---------------------------------------------------------
+
+#ifdef __WXMAC__
+// better than nothing
+typedef wxDataViewIndexListModel wxDataViewVirtualListModel;
+#else
+
+class WXDLLIMPEXP_ADV wxDataViewVirtualListModel: public wxDataViewModel
+{
+public:
+    wxDataViewVirtualListModel( unsigned int initial_size = 0 );
+    ~wxDataViewVirtualListModel();
+
+    virtual void GetValue( wxVariant &variant,
+                           unsigned int row, unsigned int col ) const = 0;
+
+    virtual bool SetValue( const wxVariant &variant,
+                           unsigned int row, unsigned int col ) = 0;
+
+    virtual bool GetAttr( unsigned int WXUNUSED(row), unsigned int WXUNUSED(col), wxDataViewItemAttr &WXUNUSED(attr) )
+        { return false; }
+
+    void RowPrepended();
+    void RowInserted( unsigned int before );
+    void RowAppended();
+    void RowDeleted( unsigned int row );
+    void RowsDeleted( const wxArrayInt &rows );
+    void RowChanged( unsigned int row );
+    void RowValueChanged( unsigned int row, unsigned int col );
+    void Reset( unsigned int new_size );
+
+    // convert to/from row/wxDataViewItem
+
+    unsigned int GetRow( const wxDataViewItem &item ) const;
+    wxDataViewItem GetItem( unsigned int row ) const;
+
+    // compare based on index
+
+    virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
+                         unsigned int column, bool ascending );
+    virtual bool HasDefaultCompare() const;
+
+    // implement base methods
+
+    virtual void GetValue( wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col ) const;
+    virtual bool SetValue( const wxVariant &variant,
+                           const wxDataViewItem &item, unsigned int col );
+    virtual bool GetAttr( const wxDataViewItem &item, unsigned int col, wxDataViewItemAttr &attr );
+    virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const;
+    virtual bool IsContainer( const wxDataViewItem &item ) const;
+    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
+
+    // internal
+    virtual bool IsVirtualListModel() const { return true; }
+    unsigned int GetLastIndex() const { return m_lastIndex; }
+
+private:
+    wxDataViewItemArray m_hash;
+    unsigned int m_lastIndex;
+    bool m_ordered;
+};
+#endif

 
 //-----------------------------------------------------------------------------
 // wxDataViewEditorCtrlEvtHandler
 
 //-----------------------------------------------------------------------------
 // wxDataViewEditorCtrlEvtHandler


@@ -238,12 +365,13 @@ class wxDataViewEditorCtrlEvtHandler: public wxEvtHandler
 {
 public:
     wxDataViewEditorCtrlEvtHandler( wxControl *editor, wxDataViewRenderer *owner );
 {
 public:
     wxDataViewEditorCtrlEvtHandler( wxControl *editor, wxDataViewRenderer *owner );

-                         
+

     void AcceptChangesAndFinish();
     void SetFocusOnIdle( bool focus = true ) { m_focusOnIdle = focus; }
 
 protected:
     void OnChar( wxKeyEvent &event );
     void AcceptChangesAndFinish();
     void SetFocusOnIdle( bool focus = true ) { m_focusOnIdle = focus; }
 
 protected:
     void OnChar( wxKeyEvent &event );

+    void OnTextEnter( wxCommandEvent &event );

     void OnKillFocus( wxFocusEvent &event );
     void OnIdle( wxIdleEvent &event );
 
     void OnKillFocus( wxFocusEvent &event );
     void OnIdle( wxIdleEvent &event );
 


@@ -279,15 +407,16 @@ enum wxDataViewCellRenderState
 class WXDLLIMPEXP_ADV wxDataViewRendererBase: public wxObject
 {
 public:
 class WXDLLIMPEXP_ADV wxDataViewRendererBase: public wxObject
 {
 public:

-    wxDataViewRendererBase( const wxString &varianttype, 
+    wxDataViewRendererBase( const wxString &varianttype,

                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );

+    ~wxDataViewRendererBase();

 
     virtual bool Validate( wxVariant& WXUNUSED(value) )
         { return true; }
 
     void SetOwner( wxDataViewColumn *owner )    { m_owner = owner; }
 
     virtual bool Validate( wxVariant& WXUNUSED(value) )
         { return true; }
 
     void SetOwner( wxDataViewColumn *owner )    { m_owner = owner; }

-    wxDataViewColumn* GetOwner()                { return m_owner; }
+    wxDataViewColumn* GetOwner() const          { return m_owner; }

 
     // renderer properties:
 
 
     // renderer properties:
 


@@ -304,7 +433,7 @@ public:
     //       to combine alignment flags (e.g. wxALIGN_LEFT|wxALIGN_BOTTOM)
     virtual void SetAlignment( int align ) = 0;
     virtual int GetAlignment() const = 0;
     //       to combine alignment flags (e.g. wxALIGN_LEFT|wxALIGN_BOTTOM)
     virtual void SetAlignment( int align ) = 0;
     virtual int GetAlignment() const = 0;

-    
+

     // in-place editing
     virtual bool HasEditorCtrl()
         { return false; }
     // in-place editing
     virtual bool HasEditorCtrl()
         { return false; }


@@ -319,13 +448,13 @@ public:
     virtual bool StartEditing( const wxDataViewItem &item, wxRect labelRect );
     virtual void CancelEditing();
     virtual bool FinishEditing();
     virtual bool StartEditing( const wxDataViewItem &item, wxRect labelRect );
     virtual void CancelEditing();
     virtual bool FinishEditing();

-    
+

     wxControl *GetEditorCtrl() { return m_editorCtrl; }
     wxControl *GetEditorCtrl() { return m_editorCtrl; }

-    
+

 protected:
     wxString                m_variantType;
     wxDataViewColumn       *m_owner;
 protected:
     wxString                m_variantType;
     wxDataViewColumn       *m_owner;

-    wxControl              *m_editorCtrl;
+    wxWeakRef<wxControl>    m_editorCtrl;

     wxDataViewItem          m_item; // for m_editorCtrl
 
     // internal utility:
     wxDataViewItem          m_item; // for m_editorCtrl
 
     // internal utility:


@@ -343,8 +472,10 @@ class WXDLLIMPEXP_ADV wxDataViewIconText: public wxObject
 {
 public:
     wxDataViewIconText( const wxString &text = wxEmptyString, const wxIcon& icon = wxNullIcon )
 {
 public:
     wxDataViewIconText( const wxString &text = wxEmptyString, const wxIcon& icon = wxNullIcon )

-    { m_icon = icon; m_text = text; }
+        : m_text(text), m_icon(icon)
+    { }

     wxDataViewIconText( const wxDataViewIconText &other )
     wxDataViewIconText( const wxDataViewIconText &other )

+        : wxObject()

     { m_icon = other.m_icon; m_text = other.m_text; }
 
     void SetText( const wxString &text ) { m_text = text; }
     { m_icon = other.m_icon; m_text = other.m_text; }
 
     void SetText( const wxString &text ) { m_text = text; }


@@ -368,68 +499,59 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
 // wxDataViewColumnBase
 // ---------------------------------------------------------
 
 // wxDataViewColumnBase
 // ---------------------------------------------------------
 

+// for compatibility only, do not use

 enum wxDataViewColumnFlags
 {
 enum wxDataViewColumnFlags
 {

-    wxDATAVIEW_COL_RESIZABLE  = 1,
-    wxDATAVIEW_COL_SORTABLE   = 2,
-    wxDATAVIEW_COL_HIDDEN     = 4
+    wxDATAVIEW_COL_RESIZABLE     = wxCOL_RESIZABLE,
+    wxDATAVIEW_COL_SORTABLE      = wxCOL_SORTABLE,
+    wxDATAVIEW_COL_REORDERABLE   = wxCOL_REORDERABLE,
+    wxDATAVIEW_COL_HIDDEN        = wxCOL_HIDDEN

 };
 
 };
 

-class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject
+class WXDLLIMPEXP_ADV wxDataViewColumnBase : public
+// native implementations of wxDataViewCtrl have their own implementations of
+// wxDataViewColumnBase and so they need to only inherit from
+// wxHeaderColumnBase to provide the same interface as the generic port which
+// uses the platform native (if any) wxHeaderColumn
+#ifdef wxHAS_GENERIC_DATAVIEWCTRL
+                                             wxHeaderColumn
+#else
+                                             wxHeaderColumnBase
+#endif

 {
 public:
 {
 public:

-    wxDataViewColumnBase( const wxString &title, wxDataViewRenderer *renderer, 
-                          unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, 
+    wxDataViewColumnBase( const wxString &title, wxDataViewRenderer *renderer,
+                          unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH,

                           wxAlignment align = wxALIGN_CENTER,
                           int flags = wxDATAVIEW_COL_RESIZABLE );
                           wxAlignment align = wxALIGN_CENTER,
                           int flags = wxDATAVIEW_COL_RESIZABLE );

-    wxDataViewColumnBase( const wxBitmap &bitmap, wxDataViewRenderer *renderer, 
-                          unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, 
+    wxDataViewColumnBase( const wxBitmap &bitmap, wxDataViewRenderer *renderer,
+                          unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH,

                           wxAlignment align = wxALIGN_CENTER,
                           int flags = wxDATAVIEW_COL_RESIZABLE );
     virtual ~wxDataViewColumnBase();
 
     // setters:
                           wxAlignment align = wxALIGN_CENTER,
                           int flags = wxDATAVIEW_COL_RESIZABLE );
     virtual ~wxDataViewColumnBase();
 
     // setters:

-
-    virtual void SetTitle( const wxString &title ) = 0;
-    virtual void SetAlignment( wxAlignment align ) = 0;
-    virtual void SetSortable( bool sortable ) = 0;
-    virtual void SetResizeable( bool resizeable ) = 0;
-    virtual void SetHidden( bool hidden ) = 0;
-    virtual void SetSortOrder( bool ascending ) = 0;
-    virtual void SetFlags( int flags );
-    virtual void SetOwner( wxDataViewCtrl *owner )  
+    virtual void SetOwner( wxDataViewCtrl *owner )

         { m_owner = owner; }
         { m_owner = owner; }

-    virtual void SetBitmap( const wxBitmap &bitmap )
-        { m_bitmap=bitmap; }
-
-    virtual void SetMinWidth( int minWidth ) = 0;
-    virtual void SetWidth( int width ) = 0;
-

 
     // getters:
 
     // getters:

+    unsigned int GetModelColumn() const { return static_cast<unsigned int>(m_model_column); }
+    wxDataViewCtrl *GetOwner() const        { return m_owner; }
+    wxDataViewRenderer* GetRenderer() const { return m_renderer; }

 
 

-    virtual wxString GetTitle() const = 0;
-    virtual wxAlignment GetAlignment() const = 0;
-    virtual int GetWidth() const = 0;
-    virtual int GetMinWidth() const = 0;
-
-    virtual int GetFlags() const;
-
-    virtual bool IsSortable() const = 0;
-    virtual bool IsResizeable() const = 0;
-    virtual bool IsHidden() const = 0;
-    virtual bool IsSortOrderAscending() const = 0;
-
-    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; }
+#ifndef wxHAS_GENERIC_DATAVIEWCTRL
+    // implement some of base class pure virtuals (the rest is port-dependent
+    // and done differently in generic and native versions)
+    virtual void SetBitmap( const wxBitmap& bitmap ) { m_bitmap = bitmap; }
+    virtual wxBitmap GetBitmap() const { return m_bitmap; }
+#endif // !wxHAS_GENERIC_DATAVIEWCTRL

 
 protected:
     wxDataViewRenderer      *m_renderer;
     int                      m_model_column;
 
 protected:
     wxDataViewRenderer      *m_renderer;
     int                      m_model_column;

+#ifndef wxHAS_GENERIC_DATAVIEWCTRL

     wxBitmap                 m_bitmap;
     wxBitmap                 m_bitmap;

+#endif // !wxHAS_GENERIC_DATAVIEWCTRL

     wxDataViewCtrl          *m_owner;
 
 protected:
     wxDataViewCtrl          *m_owner;
 
 protected:


@@ -447,6 +569,9 @@ protected:
 #define wxDV_HORIZ_RULES             0x0004     // light horizontal rules between rows
 #define wxDV_VERT_RULES              0x0008     // light vertical rules between columns
 
 #define wxDV_HORIZ_RULES             0x0004     // light horizontal rules between rows
 #define wxDV_VERT_RULES              0x0008     // light vertical rules between columns
 

+#define wxDV_ROW_LINES               0x0010     // alternating colour in rows
+#define wxDV_VARIABLE_LINE_HEIGHT    0x0020     // variable line height
+

 class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxControl
 {
 public:
 class WXDLLIMPEXP_ADV wxDataViewCtrlBase: public wxControl
 {
 public:


@@ -455,27 +580,77 @@ public:
 
     virtual bool AssociateModel( wxDataViewModel *model );
     wxDataViewModel* GetModel();
 
     virtual bool AssociateModel( wxDataViewModel *model );
     wxDataViewModel* GetModel();

+    const wxDataViewModel* GetModel() const;

 
     // short cuts
 
     // short cuts

-    wxDataViewColumn *AppendTextColumn( const wxString &label, unsigned int model_column, 
+    wxDataViewColumn *PrependTextColumn( const wxString &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
+                    wxAlignment align = wxALIGN_NOT,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependIconTextColumn( const wxString &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
+                    wxAlignment align = wxALIGN_NOT,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependToggleColumn( const wxString &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependProgressColumn( const wxString &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_DEFAULT_WIDTH,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependDateColumn( const wxString &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1,
+                    wxAlignment align = wxALIGN_NOT,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependBitmapColumn( const wxString &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependTextColumn( const wxBitmap &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
+                    wxAlignment align = wxALIGN_NOT,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependIconTextColumn( const wxBitmap &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
+                    wxAlignment align = wxALIGN_NOT,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependToggleColumn( const wxBitmap &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependProgressColumn( const wxBitmap &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_DEFAULT_WIDTH,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependDateColumn( const wxBitmap &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1,
+                    wxAlignment align = wxALIGN_NOT,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn *PrependBitmapColumn( const wxBitmap &label, unsigned int model_column,
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
+
+    wxDataViewColumn *AppendTextColumn( const wxString &label, unsigned int model_column,

                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,

-                    wxAlignment align = (wxAlignment)(wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL),
+                    wxAlignment align = wxALIGN_NOT,

                     int flags = wxDATAVIEW_COL_RESIZABLE );
                     int flags = wxDATAVIEW_COL_RESIZABLE );

-    wxDataViewColumn *AppendIconTextColumn( const wxString &label, unsigned int model_column, 
+    wxDataViewColumn *AppendIconTextColumn( const wxString &label, unsigned int model_column,

                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,

-                    wxAlignment align = (wxAlignment)(wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL),
+                    wxAlignment align = wxALIGN_NOT,

                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendToggleColumn( const wxString &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH,
                     wxAlignment align = wxALIGN_CENTER,
                     int flags = wxDATAVIEW_COL_RESIZABLE );
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendToggleColumn( const wxString &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH,
                     wxAlignment align = wxALIGN_CENTER,
                     int flags = wxDATAVIEW_COL_RESIZABLE );

-    wxDataViewColumn *AppendProgressColumn( const wxString &label, unsigned int model_column, 
+    wxDataViewColumn *AppendProgressColumn( const wxString &label, unsigned int model_column,

                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_DEFAULT_WIDTH,
                     wxAlignment align = wxALIGN_CENTER,
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendDateColumn( const wxString &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_DEFAULT_WIDTH,
                     wxAlignment align = wxALIGN_CENTER,
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendDateColumn( const wxString &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1,

-                    wxAlignment align = (wxAlignment)(wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL),
+                    wxAlignment align = wxALIGN_NOT,

                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendBitmapColumn( const wxString &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendBitmapColumn( const wxString &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,


@@ -483,11 +658,11 @@ public:
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendTextColumn( const wxBitmap &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendTextColumn( const wxBitmap &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,

-                    wxAlignment align = (wxAlignment)(wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL),
+                    wxAlignment align = wxALIGN_NOT,

                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendIconTextColumn( const wxBitmap &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendIconTextColumn( const wxBitmap &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,

-                    wxAlignment align = (wxAlignment)(wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL),
+                    wxAlignment align = wxALIGN_NOT,

                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH,
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH,


@@ -499,34 +674,36 @@ public:
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendDateColumn( const wxBitmap &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1,
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendDateColumn( const wxBitmap &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1,

-                    wxAlignment align = (wxAlignment)(wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL),
+                    wxAlignment align = wxALIGN_NOT,

                     int flags = wxDATAVIEW_COL_RESIZABLE );
                     int flags = wxDATAVIEW_COL_RESIZABLE );

-    

     wxDataViewColumn *AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
                     wxAlignment align = wxALIGN_CENTER,
                     int flags = wxDATAVIEW_COL_RESIZABLE );
     wxDataViewColumn *AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
                     wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
                     wxAlignment align = wxALIGN_CENTER,
                     int flags = wxDATAVIEW_COL_RESIZABLE );

-    
+
+
+    virtual bool PrependColumn( wxDataViewColumn *col );
+    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col );

     virtual bool AppendColumn( wxDataViewColumn *col );
 
     virtual unsigned int GetColumnCount() const = 0;
     virtual wxDataViewColumn* GetColumn( unsigned int pos ) const = 0;
     virtual int GetColumnPosition( const wxDataViewColumn *column ) const = 0;
     virtual bool AppendColumn( wxDataViewColumn *col );
 
     virtual unsigned int GetColumnCount() const = 0;
     virtual wxDataViewColumn* GetColumn( unsigned int pos ) const = 0;
     virtual int GetColumnPosition( const wxDataViewColumn *column ) const = 0;

-    
+

     virtual bool DeleteColumn( wxDataViewColumn *column ) = 0;
     virtual bool ClearColumns() = 0;
     virtual bool DeleteColumn( wxDataViewColumn *column ) = 0;
     virtual bool ClearColumns() = 0;

-    
+

     void SetExpanderColumn( wxDataViewColumn *col )
         { m_expander_column = col ; DoSetExpanderColumn(); }
     void SetExpanderColumn( wxDataViewColumn *col )
         { m_expander_column = col ; DoSetExpanderColumn(); }

-    wxDataViewColumn *GetExpanderColumn() const 
+    wxDataViewColumn *GetExpanderColumn() const

         { return m_expander_column; }
         { return m_expander_column; }

-        
+

     virtual wxDataViewColumn *GetSortingColumn() const = 0;
 
     void SetIndent( int indent )
         { m_indent = indent ; DoSetIndent(); }
     virtual wxDataViewColumn *GetSortingColumn() const = 0;
 
     void SetIndent( int indent )
         { m_indent = indent ; DoSetIndent(); }

-    int GetIndent() const 
-        { return m_indent; } 
+    int GetIndent() const
+        { return m_indent; }

 
     virtual wxDataViewItem GetSelection() const = 0;
     virtual int GetSelections( wxDataViewItemArray & sel ) const = 0;
 
     virtual wxDataViewItem GetSelection() const = 0;
     virtual int GetSelections( wxDataViewItemArray & sel ) const = 0;


@@ -554,7 +731,7 @@ private:
     wxDataViewModel        *m_model;
     wxDataViewColumn       *m_expander_column;
     int m_indent ;
     wxDataViewModel        *m_model;
     wxDataViewColumn       *m_expander_column;
     int m_indent ;

-       
+

 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase)
 };
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCtrlBase)
 };


@@ -572,7 +749,8 @@ public:
         m_col(-1),
         m_model(NULL),
         m_value(wxNullVariant),
         m_col(-1),
         m_model(NULL),
         m_value(wxNullVariant),

-        m_column(NULL)
+        m_column(NULL),
+        m_pos(-1,-1)

         { }
 
     wxDataViewEvent(const wxDataViewEvent& event)
         { }
 
     wxDataViewEvent(const wxDataViewEvent& event)


@@ -581,7 +759,8 @@ public:
         m_col(event.m_col),
         m_model(event.m_model),
         m_value(event.m_value),
         m_col(event.m_col),
         m_model(event.m_model),
         m_value(event.m_value),

-        m_column(event.m_column)
+        m_column(event.m_column),
+        m_pos(m_pos)

         { }
 
     wxDataViewItem GetItem() const { return m_item; }
         { }
 
     wxDataViewItem GetItem() const { return m_item; }


@@ -600,6 +779,10 @@ public:
     void SetDataViewColumn( wxDataViewColumn *col ) { m_column = col; }
     wxDataViewColumn *GetDataViewColumn() const { return m_column; }
 
     void SetDataViewColumn( wxDataViewColumn *col ) { m_column = col; }
     wxDataViewColumn *GetDataViewColumn() const { return m_column; }
 

+    // for wxEVT_DATAVIEW_CONTEXT_MENU only
+    wxPoint GetPosition() const { return m_pos; }
+    void SetPosition( int x, int y ) { m_pos.x = x; m_pos.y = y; }
+

     virtual wxEvent *Clone() const { return new wxDataViewEvent(*this); }
 
 protected:
     virtual wxEvent *Clone() const { return new wxDataViewEvent(*this); }
 
 protected:


@@ -608,27 +791,29 @@ protected:
     wxDataViewModel    *m_model;
     wxVariant           m_value;
     wxDataViewColumn   *m_column;
     wxDataViewModel    *m_model;
     wxVariant           m_value;
     wxDataViewColumn   *m_column;

+    wxPoint             m_pos;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent)
 };
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, -1)
-    
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, -1)
-    
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, -1)
-END_DECLARE_EVENT_TYPES()
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED;
+
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED;
+
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU;
+
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED;

 
 typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 
 
 typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 


@@ -649,18 +834,78 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 #define EVT_DATAVIEW_ITEM_EDITING_DONE(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_EDITING_DONE, id, fn)
 #define EVT_DATAVIEW_ITEM_VALUE_CHANGED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_VALUE_CHANGED, id, fn)
 
 #define EVT_DATAVIEW_ITEM_EDITING_DONE(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_EDITING_DONE, id, fn)
 #define EVT_DATAVIEW_ITEM_VALUE_CHANGED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_VALUE_CHANGED, id, fn)
 

+#define EVT_DATAVIEW_ITEM_CONTEXT_MENU(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_CONTEXT_MENU, id, fn)
+

 #define EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_CLICK, id, fn)
 #define EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_RIGHT_CLICK, id, fn)
 #define EVT_DATAVIEW_COLUMN_SORTED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_SORTED, id, fn)
 #define EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_CLICK, id, fn)
 #define EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_RIGHT_CLICK, id, fn)
 #define EVT_DATAVIEW_COLUMN_SORTED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_SORTED, id, fn)

+#define EVT_DATAVIEW_COLUMN_REORDERED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_REORDERED, id, fn)
+
+
+#ifdef wxHAS_GENERIC_DATAVIEWCTRL
+    // this symbol doesn't follow the convention for wxUSE_XXX symbols which
+    // are normally always defined as either 0 or 1, so its use is deprecated
+    // and it only exists for backwards compatibility, don't use it any more
+    // and use wxHAS_GENERIC_DATAVIEWCTRL instead
+    #define wxUSE_GENERICDATAVIEWCTRL

 
 

-#if defined(wxUSE_GENERICDATAVIEWCTRL)

     #include "wx/generic/dataview.h"
 #elif defined(__WXGTK20__)
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)
     #include "wx/generic/dataview.h"
 #elif defined(__WXGTK20__)
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/dataview.h"
+    #include "wx/osx/dataview.h"

 #else
 #else

-    #include "wx/generic/dataview.h"
+    #error "unknown native wxDataViewCtrl implementation"
+#endif
+
+// -------------------------------------
+// wxDataViewSpinRenderer
+// -------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewSpinRenderer: public wxDataViewCustomRenderer
+{
+public:
+    wxDataViewSpinRenderer( int min, int max,
+                            wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
+                            int alignment = wxDVR_DEFAULT_ALIGNMENT );
+    virtual bool HasEditorCtrl() { return true; }
+    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+    virtual bool Render( wxRect rect, wxDC *dc, int state );
+    virtual wxSize GetSize() const;
+    virtual bool SetValue( const wxVariant &value );
+    virtual bool GetValue( wxVariant &value ) const;
+
+private:
+    long    m_data;
+    long    m_min,m_max;
+};
+
+#ifndef __WXGTK20__
+
+// -------------------------------------
+// wxDataViewChoiceRenderer
+// -------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewChoiceRenderer: public wxDataViewCustomRenderer
+{
+public:
+    wxDataViewChoiceRenderer( const wxArrayString &choices,
+                            wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
+                            int alignment = wxDVR_DEFAULT_ALIGNMENT );
+    virtual bool HasEditorCtrl() { return true; }
+    virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
+    virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
+    virtual bool Render( wxRect rect, wxDC *dc, int state );
+    virtual wxSize GetSize() const;
+    virtual bool SetValue( const wxVariant &value );
+    virtual bool GetValue( wxVariant &value ) const;
+
+private:
+    wxArrayString m_choices;
+    wxString      m_data;
+};
+

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -673,8 +918,8 @@ public:
     wxDataViewTreeStoreNode( wxDataViewTreeStoreNode *parent,
         const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL );
     virtual ~wxDataViewTreeStoreNode();
     wxDataViewTreeStoreNode( wxDataViewTreeStoreNode *parent,
         const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL );
     virtual ~wxDataViewTreeStoreNode();

-    
-    void SetText( const wxString &text ) 
+
+    void SetText( const wxString &text )

         { m_text = text; }
     wxString GetText() const
         { return m_text; }
         { m_text = text; }
     wxString GetText() const
         { return m_text; }


@@ -686,16 +931,16 @@ public:
         { if (m_data) delete m_data; m_data = data; }
     wxClientData *GetData() const
         { return m_data; }
         { if (m_data) delete m_data; m_data = data; }
     wxClientData *GetData() const
         { return m_data; }

-    
+

     wxDataViewItem GetItem() const
         { return wxDataViewItem( (void*) this ); }
     wxDataViewItem GetItem() const
         { return wxDataViewItem( (void*) this ); }

-    
+

     virtual bool IsContainer()
         { return false; }
     virtual bool IsContainer()
         { return false; }

-        
+

     wxDataViewTreeStoreNode *GetParent()
         { return m_parent; }
     wxDataViewTreeStoreNode *GetParent()
         { return m_parent; }

-        
+

 private:
     wxDataViewTreeStoreNode  *m_parent;
     wxString                  m_text;
 private:
     wxDataViewTreeStoreNode  *m_parent;
     wxString                  m_text;


@@ -709,27 +954,33 @@ WX_DECLARE_LIST_WITH_DECL(wxDataViewTreeStoreNode, wxDataViewTreeStoreNodeList,
 class WXDLLIMPEXP_ADV wxDataViewTreeStoreContainerNode: public wxDataViewTreeStoreNode
 {
 public:
 class WXDLLIMPEXP_ADV wxDataViewTreeStoreContainerNode: public wxDataViewTreeStoreNode
 {
 public:

-    wxDataViewTreeStoreContainerNode( wxDataViewTreeStoreNode *parent, 
-        const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon, 
+    wxDataViewTreeStoreContainerNode( wxDataViewTreeStoreNode *parent,
+        const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon,

         wxClientData *data = NULL );
     virtual ~wxDataViewTreeStoreContainerNode();
 
         wxClientData *data = NULL );
     virtual ~wxDataViewTreeStoreContainerNode();
 

-    const wxDataViewTreeStoreNodeList &GetChildren() const 
+    const wxDataViewTreeStoreNodeList &GetChildren() const

         { return m_children; }
         { return m_children; }

-    wxDataViewTreeStoreNodeList &GetChildren() 
+    wxDataViewTreeStoreNodeList &GetChildren()

         { return m_children; }
 
     void SetExpandedIcon( const wxIcon &icon )
         { m_iconExpanded = icon; }
     const wxIcon &GetExpandedIcon() const
         { return m_iconExpanded; }
         { return m_children; }
 
     void SetExpandedIcon( const wxIcon &icon )
         { m_iconExpanded = icon; }
     const wxIcon &GetExpandedIcon() const
         { return m_iconExpanded; }

-    
+
+    void SetExpanded( bool expanded = true )
+        { m_isExpanded = expanded; }
+    bool IsExpanded() const
+        { return m_isExpanded; }
+

     virtual bool IsContainer()
         { return true; }
     virtual bool IsContainer()
         { return true; }

-        
+

 private:
     wxDataViewTreeStoreNodeList  m_children;
     wxIcon                       m_iconExpanded;
 private:
     wxDataViewTreeStoreNodeList  m_children;
     wxIcon                       m_iconExpanded;

+    bool                         m_isExpanded;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -740,29 +991,29 @@ public:
     wxDataViewTreeStore();
     ~wxDataViewTreeStore();
 
     wxDataViewTreeStore();
     ~wxDataViewTreeStore();
 

-    wxDataViewItem AppendItem( const wxDataViewItem& parent, 
+    wxDataViewItem AppendItem( const wxDataViewItem& parent,

         const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL );
     wxDataViewItem PrependItem( const wxDataViewItem& parent,
         const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL );
     wxDataViewItem InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous,
         const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL );
         const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL );
     wxDataViewItem PrependItem( const wxDataViewItem& parent,
         const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL );
     wxDataViewItem InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous,
         const wxString &text, const wxIcon &icon = wxNullIcon, wxClientData *data = NULL );

-    
-    wxDataViewItem PrependContainer( const wxDataViewItem& parent, 
-        const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon, 
+
+    wxDataViewItem PrependContainer( const wxDataViewItem& parent,
+        const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon,

         wxClientData *data = NULL );
     wxDataViewItem AppendContainer( const wxDataViewItem& parent,
         wxClientData *data = NULL );
     wxDataViewItem AppendContainer( const wxDataViewItem& parent,

-        const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon, 
+        const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon,

         wxClientData *data = NULL );
     wxDataViewItem InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous,
         wxClientData *data = NULL );
     wxDataViewItem InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous,

-        const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon, 
+        const wxString &text, const wxIcon &icon = wxNullIcon, const wxIcon &expanded = wxNullIcon,

         wxClientData *data = NULL );
 
     wxDataViewItem GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const;
     int GetChildCount( const wxDataViewItem& parent ) const;
         wxClientData *data = NULL );
 
     wxDataViewItem GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const;
     int GetChildCount( const wxDataViewItem& parent ) const;

-    
+

     void SetItemText( const wxDataViewItem& item, const wxString &text );
     wxString GetItemText( const wxDataViewItem& item ) const;
     void SetItemText( const wxDataViewItem& item, const wxString &text );
     wxString GetItemText( const wxDataViewItem& item ) const;

-    void SetItemIcon( const wxDataViewItem& item, const wxIcon &icon ); 
+    void SetItemIcon( const wxDataViewItem& item, const wxIcon &icon );

     const wxIcon &GetItemIcon( const wxDataViewItem& item ) const;
     void SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon );
     const wxIcon &GetItemExpandedIcon( const wxDataViewItem& item ) const;
     const wxIcon &GetItemIcon( const wxDataViewItem& item ) const;
     void SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon );
     const wxIcon &GetItemExpandedIcon( const wxDataViewItem& item ) const;


@@ -772,59 +1023,115 @@ public:
     void DeleteItem( const wxDataViewItem& item );
     void DeleteChildren( const wxDataViewItem& item );
     void DeleteAllItems();
     void DeleteItem( const wxDataViewItem& item );
     void DeleteChildren( const wxDataViewItem& item );
     void DeleteAllItems();

-    
+

     // implement base methods
 
     // implement base methods
 

-    virtual void GetValue( wxVariant &variant, 
+    virtual void GetValue( wxVariant &variant,

                            const wxDataViewItem &item, unsigned int col ) const;
                            const wxDataViewItem &item, unsigned int col ) const;

-    virtual bool SetValue( const wxVariant &variant, 
+    virtual bool SetValue( const wxVariant &variant,

                            const wxDataViewItem &item, unsigned int col );
     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const;
     virtual bool IsContainer( const wxDataViewItem &item ) const;
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
 
                            const wxDataViewItem &item, unsigned int col );
     virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const;
     virtual bool IsContainer( const wxDataViewItem &item ) const;
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
 

-    virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2, 
+    virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,

                          unsigned int column, bool ascending );
                          unsigned int column, bool ascending );

-                         
-    virtual bool HasDefaultCompare() const 
+
+    virtual bool HasDefaultCompare() const

         { return true; }
         { return true; }

-    virtual unsigned int GetColumnCount() const 
+    virtual unsigned int GetColumnCount() const

         { return 1; };
         { return 1; };

-    virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const 
-        { return "wxDataViewIconText"; }
-    
+    virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const
+        { return wxT("wxDataViewIconText"); }
+

     wxDataViewTreeStoreNode *FindNode( const wxDataViewItem &item ) const;
     wxDataViewTreeStoreContainerNode *FindContainerNode( const wxDataViewItem &item ) const;
     wxDataViewTreeStoreNode *GetRoot() const { return m_root; }
     wxDataViewTreeStoreNode *FindNode( const wxDataViewItem &item ) const;
     wxDataViewTreeStoreContainerNode *FindContainerNode( const wxDataViewItem &item ) const;
     wxDataViewTreeStoreNode *GetRoot() const { return m_root; }

-    
+

 public:
     wxDataViewTreeStoreNode *m_root;
 };
 
 public:
     wxDataViewTreeStoreNode *m_root;
 };
 

-#if 0

 class WXDLLIMPEXP_ADV wxDataViewTreeCtrl: public wxDataViewCtrl
 {
 public:
 class WXDLLIMPEXP_ADV wxDataViewTreeCtrl: public wxDataViewCtrl
 {
 public:

-    wxDataViewCtrl( wxWindow *parent, wxWindowID id,
+    wxDataViewTreeCtrl();
+    wxDataViewTreeCtrl( wxWindow *parent, wxWindowID id,

            const wxPoint& pos = wxDefaultPosition,
            const wxPoint& pos = wxDefaultPosition,

-           const wxSize& size = wxDefaultSize, long style = wxDV_NO_HEADER,
+           const wxSize& size = wxDefaultSize, long style = wxDV_NO_HEADER | wxDV_ROW_LINES,

            const wxValidator& validator = wxDefaultValidator );
            const wxValidator& validator = wxDefaultValidator );

+    ~wxDataViewTreeCtrl();

 
     bool Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,
 
     bool Create( wxWindow *parent, wxWindowID id,
            const wxPoint& pos = wxDefaultPosition,

-           const wxSize& size = wxDefaultSize, long style = wxDV_NO_HEADER,
+           const wxSize& size = wxDefaultSize, long style = wxDV_NO_HEADER | wxDV_ROW_LINES,

            const wxValidator& validator = wxDefaultValidator );
 
     wxDataViewTreeStore *GetStore()
         { return (wxDataViewTreeStore*) GetModel(); }
            const wxValidator& validator = wxDefaultValidator );
 
     wxDataViewTreeStore *GetStore()
         { return (wxDataViewTreeStore*) GetModel(); }

- 
-    void OnExpand( wxDataViewCtrl &event );
-    void OnCollapse( wxDataViewCtrl &event ); 
-       
+    const wxDataViewTreeStore *GetStore() const
+        { return (const wxDataViewTreeStore*) GetModel(); }
+
+    void SetImageList( wxImageList *imagelist );
+    wxImageList* GetImageList() { return m_imageList; }
+
+    wxDataViewItem AppendItem( const wxDataViewItem& parent,
+        const wxString &text, int icon = -1, wxClientData *data = NULL );
+    wxDataViewItem PrependItem( const wxDataViewItem& parent,
+        const wxString &text, int icon = -1, wxClientData *data = NULL );
+    wxDataViewItem InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous,
+        const wxString &text, int icon = -1, wxClientData *data = NULL );
+
+    wxDataViewItem PrependContainer( const wxDataViewItem& parent,
+        const wxString &text, int icon = -1, int expanded = -1,
+        wxClientData *data = NULL );
+    wxDataViewItem AppendContainer( const wxDataViewItem& parent,
+        const wxString &text, int icon = -1, int expanded = -1,
+        wxClientData *data = NULL );
+    wxDataViewItem InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous,
+        const wxString &text, int icon = -1, int expanded = -1,
+        wxClientData *data = NULL );
+
+    wxDataViewItem GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const
+        { return GetStore()->GetNthChild(parent, pos); }
+    int GetChildCount( const wxDataViewItem& parent ) const
+        { return GetStore()->GetChildCount(parent); }
+
+    void SetItemText( const wxDataViewItem& item, const wxString &text )
+        { GetStore()->SetItemText(item,text); }
+    wxString GetItemText( const wxDataViewItem& item ) const
+        { return GetStore()->GetItemText(item); }
+    void SetItemIcon( const wxDataViewItem& item, const wxIcon &icon )
+        { GetStore()->SetItemIcon(item,icon); }
+    const wxIcon &GetItemIcon( const wxDataViewItem& item ) const
+        { return GetStore()->GetItemIcon(item); }
+    void SetItemExpandedIcon( const wxDataViewItem& item, const wxIcon &icon )
+        { GetStore()->SetItemExpandedIcon(item,icon); }
+    const wxIcon &GetItemExpandedIcon( const wxDataViewItem& item ) const
+        { return GetStore()->GetItemExpandedIcon(item); }
+    void SetItemData( const wxDataViewItem& item, wxClientData *data )
+        { GetStore()->SetItemData(item,data); }
+    wxClientData *GetItemData( const wxDataViewItem& item ) const
+        { return GetStore()->GetItemData(item); }
+
+    void DeleteItem( const wxDataViewItem& item )
+        { GetStore()->DeleteItem(item); }
+    void DeleteChildren( const wxDataViewItem& item )
+        { GetStore()->DeleteChildren(item); }
+    void DeleteAllItems()
+        { GetStore()->DeleteAllItems(); }
+
+    void OnExpanded( wxDataViewEvent &event );
+    void OnCollapsed( wxDataViewEvent &event );
+    void OnSize( wxSizeEvent &event );
+
+private:
+    wxImageList  *m_imageList;
+

 private:
 private:

+    DECLARE_EVENT_TABLE()

     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewTreeCtrl)
 };
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewTreeCtrl)
 };

-#endif

 
 #endif // wxUSE_DATAVIEWCTRL
 
 
 #endif // wxUSE_DATAVIEWCTRL