Most of FM's wxDataViewCtrl patch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/dataview.h

@@ -47,25 +47,31 @@ class WXDLLIMPEXP_ADV wxDataViewRenderer;
 
 extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxDataViewCtrlNameStr[];
 
+// the default width of new (text) columns:
+#define wxDVC_DEFAULT_WIDTH             80
+
+// the default width of new toggle columns:
+#define wxDVC_TOGGLE_DEFAULT_WIDTH      30
+
+
 // ---------------------------------------------------------
 // wxDataViewModel
 // ---------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxDataViewModel: public wxObject
+class WXDLLIMPEXP_ADV wxDataViewModel: public wxObjectRefData
 {
 public:
     wxDataViewModel() { }
-    virtual ~wxDataViewModel() { }
 
 protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewModel)
+    // the user should not delete this class directly: he should use DecRef() instead!
+    virtual ~wxDataViewModel() { }
 };
 
 // ---------------------------------------------------------
 // wxDataViewListModelNotifier
 // ---------------------------------------------------------
 
-
 class WXDLLIMPEXP_ADV wxDataViewListModelNotifier: public wxObject
 {
 public:
@@ -80,6 +86,8 @@ public:
     virtual bool ValueChanged( unsigned int col, unsigned int row ) = 0;
     virtual bool RowsReordered( unsigned int *new_order ) = 0;
     virtual bool Cleared() = 0;
+    virtual bool Freed()
+        { m_owner = NULL; return true; }
 
     void SetOwner( wxDataViewListModel *owner ) { m_owner = owner; }
     wxDataViewListModel *GetOwner()             { return m_owner; }
@@ -107,16 +115,24 @@ public:
 
 class WXDLLIMPEXP_ADV wxDataViewListModel: public wxDataViewModel
 {
+    friend class WXDLLIMPEXP_ADV wxDataViewCtrl;
+    friend class WXDLLIMPEXP_ADV wxDataViewCtrlBase;
+    friend class WXDLLIMPEXP_ADV wxDataViewSortedListModel;
+    friend class WXDLLIMPEXP_ADV wxDataViewColumnBase;
+    friend class WXDLLIMPEXP_ADV wxGtkDataViewListModelNotifier;
+
 public:
     wxDataViewListModel();
-    virtual ~wxDataViewListModel();
 
     virtual unsigned int GetNumberOfRows() = 0;
     virtual unsigned int GetNumberOfCols() = 0;
+
     // return type as reported by wxVariant
     virtual wxString GetColType( unsigned int col ) = 0;
+
     // get value into a wxVariant
     virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row ) = 0;
+
     // set value, call ValueChanged() afterwards!
     virtual bool SetValue( wxVariant &variant, unsigned int col, unsigned int row ) = 0;
 
@@ -130,6 +146,10 @@ public:
     virtual bool RowsReordered( unsigned int *new_order );
     virtual bool Cleared();
 
+protected:
+    // the user should not delete this class directly: he should use DecRef() instead!
+    virtual ~wxDataViewListModel();
+
     // Used internally
     void AddViewingColumn( wxDataViewColumn *view_column, unsigned int model_column );
     void RemoveViewingColumn( wxDataViewColumn *column );
@@ -139,11 +159,10 @@ public:
 
     wxList                      m_notifiers;
     wxList                      m_viewingColumns;
-
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewListModel)
 };
 
+
+
 // ---------------------------------------------------------
 // wxDataViewSortedListModel
 // ---------------------------------------------------------
@@ -155,6 +174,8 @@ WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSortedIndexA
 
 class WXDLLIMPEXP_ADV wxDataViewSortedListModel: public wxDataViewListModel
 {
+    friend class wxDataViewSortedListModelNotifier;
+
 public:
     wxDataViewSortedListModel( wxDataViewListModel *child );
     virtual ~wxDataViewSortedListModel();
@@ -200,9 +221,6 @@ private:
     wxDataViewListModelNotifier     *m_notifierOnChild;
     
     void InitStatics(); // BAD
-
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewSortedListModel)
 };
 
 // ---------------------------------------------------------
@@ -262,10 +280,14 @@ enum wxDataViewColumnFlags
 class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject
 {
 public:
-    wxDataViewColumnBase( const wxString &title, wxDataViewRenderer *renderer, unsigned int model_column,
+    wxDataViewColumnBase( const wxString &title, wxDataViewRenderer *renderer, 
-        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
+                          unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, 
-    wxDataViewColumnBase( const wxBitmap &bitmap, wxDataViewRenderer *renderer, unsigned int model_column,
+                          wxAlignment align = wxALIGN_CENTER,
-        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
+                          int flags = wxDATAVIEW_COL_RESIZABLE );
+    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();
 
     virtual void SetTitle( const wxString &title );
@@ -277,9 +299,15 @@ public:
     virtual void SetAlignment( wxAlignment align ) = 0;
     
     virtual void SetSortable( bool sortable ) = 0;
-    virtual bool GetSortable() = 0;
+    virtual bool IsSortable() const
+        { return (m_flags & wxDATAVIEW_COL_SORTABLE) != 0; }
+    virtual bool IsResizeable() const
+        { return (m_flags & wxDATAVIEW_COL_RESIZABLE) != 0; }
+    virtual bool IsHidden() const
+        { return (m_flags & wxDATAVIEW_COL_HIDDEN) != 0; }
+
     virtual void SetSortOrder( bool ascending ) = 0;
-    virtual bool IsSortOrderAscending() = 0;
+    virtual bool IsSortOrderAscending() const = 0;
 
     wxDataViewRenderer* GetRenderer()       { return m_renderer; }
 
@@ -288,7 +316,7 @@ public:
     virtual void SetOwner( wxDataViewCtrl *owner )  { m_owner = owner; }
     wxDataViewCtrl *GetOwner()              { return m_owner; }
 
-    virtual int GetWidth() = 0;
+    virtual int GetWidth() const = 0;
 
 private:
     wxDataViewCtrl          *m_ctrl;
@@ -321,25 +349,45 @@ public:
 
     // short cuts
     bool 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 = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
     bool AppendToggleColumn( const wxString &label, unsigned int model_column,
-                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = 30 );
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
     bool AppendProgressColumn( const wxString &label, unsigned int model_column, 
-                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = 80 );
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_DEFAULT_WIDTH,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
     bool AppendDateColumn( const wxString &label, unsigned int model_column,
-                    wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1 );
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
     bool AppendBitmapColumn( 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 = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
     bool AppendTextColumn( const wxBitmap &label, unsigned int model_column,
-                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1 );
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
     bool AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
-                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = 30 );
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_TOGGLE_DEFAULT_WIDTH,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
     bool AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
-                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = 80 );
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = wxDVC_DEFAULT_WIDTH,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
     bool AppendDateColumn( const wxBitmap &label, unsigned int model_column,
-                    wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1 );
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, int width = -1,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
     bool AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
-                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1 );
+                    wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int width = -1,
+                    wxAlignment align = wxALIGN_CENTER,
+                    int flags = wxDATAVIEW_COL_RESIZABLE );
     
     virtual bool AppendColumn( wxDataViewColumn *col );
     virtual unsigned int GetNumberOfColumns();

include/wx/generic/dataview.h

@@ -32,7 +32,8 @@ class WXDLLIMPEXP_ADV wxDataViewHeaderWindow;
 class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase
 {
 public:
-    wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    wxDataViewRenderer( const wxString &varianttype, 
+                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
     virtual ~wxDataViewRenderer();
 
     virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
@@ -148,7 +149,8 @@ public:
     bool GetValue( wxVariant &value );
 
     bool Render( wxRect cell, wxDC *dc, int state );
-    bool Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, unsigned int row );
+    bool Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, 
+                   unsigned int row );
     wxSize GetSize();
 
 private:
@@ -213,28 +215,46 @@ protected:
 
 class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
 {
+    friend class wxDataViewHeaderWindowBase;
+    friend class wxDataViewHeaderWindow;
+    friend class wxDataViewHeaderWindowMSW;
+
 public:
-    wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, unsigned int model_column, 
+    wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, 
-        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
+                      unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, 
-    wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer, unsigned int model_column,
+                      wxAlignment align = wxALIGN_CENTER,
-        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
+                      int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer, 
+                      unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, 
+                      wxAlignment align = wxALIGN_CENTER,
+                      int flags = wxDATAVIEW_COL_RESIZABLE );
     virtual ~wxDataViewColumn();
 
     virtual void SetTitle( const wxString &title );
     virtual void SetBitmap( const wxBitmap &bitmap );
     
-    virtual void SetAlignment( wxAlignment align );
+    virtual void SetAlignment( wxAlignment align )
+        { m_align=align; }
+    wxAlignment GetAlignment() const
+        { return m_align; }
     
     virtual void SetSortable( bool sortable );
-    virtual bool GetSortable();
     virtual void SetSortOrder( bool ascending );
-    virtual bool IsSortOrderAscending();
+    virtual bool IsSortOrderAscending() const;
 
-    virtual int GetWidth();
+    virtual int GetWidth() const;
+
+protected:
+
+    void SetWidth(int w)
+        { m_width=w; }
 
 private:
     int                      m_width;
     int                      m_fixedWidth;
+    wxAlignment m_align;
+
+    void Init(int width);
 
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn)
@@ -247,6 +267,11 @@ protected:
 class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase,
                                        public wxScrollHelperNative
 {
+    friend class wxDataViewMainWindow;
+    friend class wxDataViewHeaderWindowBase;
+    friend class wxDataViewHeaderWindow;
+    friend class wxDataViewHeaderWindowMSW;
+
 public:
     wxDataViewCtrl() : wxScrollHelperNative(this)
     {
@@ -283,9 +308,14 @@ public:
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
+    // returns the "best" width for the idx-th column
+    unsigned int GetBestColumnWidth(int WXUNUSED(idx))
+    {
+        return GetClientSize().GetWidth() / GetNumberOfColumns();
+    }
+
+
 private:
-    friend class wxDataViewMainWindow;
-    friend class wxDataViewHeaderWindow;
     wxDataViewListModelNotifier *m_notifier;
     wxDataViewMainWindow        *m_clientArea;
     wxDataViewHeaderWindow      *m_headerArea;

include/wx/gtk/dataview.h

@@ -21,6 +21,7 @@
 
 class WXDLLIMPEXP_CORE wxDataViewCtrl;
 
+
 // --------------------------------------------------------- 
 // wxDataViewRenderer
 // --------------------------------------------------------- 
@@ -28,7 +29,8 @@ class WXDLLIMPEXP_CORE wxDataViewCtrl;
 class wxDataViewRenderer: public wxDataViewRendererBase
 {
 public:
-    wxDataViewRenderer( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
+    wxDataViewRenderer( const wxString &varianttype, 
+                        wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT );
 
     // implementation
     void* GetGtkHandle() { return m_renderer; }
@@ -188,10 +190,15 @@ protected:
 class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
 {
 public:
-    wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, unsigned int model_column,
+    wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer,
-        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
+                      unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH,
-    wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer, unsigned int model_column,
+                      wxAlignment align = wxALIGN_CENTER,
-        int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
+                      int flags = wxDATAVIEW_COL_RESIZABLE );
+    wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer,
+                      unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH,
+                      wxAlignment align = wxALIGN_CENTER,
+                      int flags = wxDATAVIEW_COL_RESIZABLE );
+
     virtual ~wxDataViewColumn();
 
     virtual void SetTitle( const wxString &title );
@@ -202,14 +209,15 @@ public:
     virtual void SetAlignment( wxAlignment align );
     
     virtual void SetSortable( bool sortable );
-    virtual bool GetSortable();
     virtual void SetSortOrder( bool ascending );
-    virtual bool IsSortOrderAscending();
 
-    virtual int GetWidth();
+    virtual bool IsSortable() const;
+    virtual bool IsSortOrderAscending() const;
+
+    virtual int GetWidth() const;
     
     virtual void SetFixedWidth( int width );
-    virtual int GetFixedWidth();
+    virtual int GetFixedWidth() const;
     
     // implementation
     void* GetGtkHandle() { return m_column; }

samples/dataview/dataview.cpp

@@ -21,6 +21,8 @@
 #endif
 
 #include "wx/datetime.h"
+#include "wx/splitter.h"
+#include "wx/aboutdlg.h"
 
 #ifndef __WXMSW__
     #include "../sample.xpm"
@@ -34,9 +36,9 @@
 // MyTextModel
 // -------------------------------------
 
-WX_DECLARE_LIST(wxDateTime,wxArrayDate);
+WX_DECLARE_OBJARRAY(wxDateTime,wxArrayDate);
-#include <wx/listimpl.cpp>
+#include <wx/arrimpl.cpp>
-WX_DEFINE_LIST(wxArrayDate)
+WX_DEFINE_OBJARRAY(wxArrayDate)
 
 class MyTextModel: public wxDataViewListModel
 {
@@ -54,8 +56,8 @@ public:
             { m_progress.Add( i/10 ); }
         for (i = 0; i < 1000; i++)
             {
-                wxDateTime *date = new wxDateTime( wxDateTime::Now() );
+                wxDateTime date( wxDateTime::Now() );
-                m_dates.Append( date );
+                m_dates.Add( date );
             }
     }
 
@@ -83,7 +85,7 @@ public:
         {
             if (col == 6)
             {
-                variant = (wxDateTime) *m_dates[row];
+                variant = (wxDateTime) m_dates[row];
             } else
             if (col == 5)
             {
@@ -95,7 +97,7 @@ public:
             } else
             if (col == 3)
             {
-                variant = (bool) m_bools[row];
+                variant = (bool) (m_bools[row] != 0);
             } else
             if (col == 2)
             {
@@ -112,7 +114,7 @@ public:
         {
             if (col == 6)
             {
-                *m_dates[row] = value.GetDateTime();
+                m_dates[row] = value.GetDateTime();
             } else
             if (col == 3)
             {
@@ -263,13 +265,14 @@ class MyApp: public wxApp
 {
 public:
     bool OnInit(void);
+    int OnExit();
 };
 
 // -------------------------------------
 // MyFrame
 // -------------------------------------
 
-class MyFrame: public wxFrame
+class MyFrame : public wxFrame
 {
 public:
     MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);
@@ -277,10 +280,26 @@ public:
 public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
+    void OnNewSortingFrame(wxCommandEvent& event);
+
+    void OnSingleSelMode(wxCommandEvent& event);
+    void OnMultipleSelMode(wxCommandEvent& event);
+    void OnResizeableColumn(wxCommandEvent& event);
+    void OnSortableColumn(wxCommandEvent& event);
+    void OnHideColumn(wxCommandEvent& event);
+    void OnChooseAlign(wxCommandEvent& event);
 
 private:
     wxDataViewCtrl* dataview_left;
     wxDataViewCtrl* dataview_right;
+    wxSplitterWindow *m_splitter;
+
+    wxAlignment m_align;
+
+    void CreateControls();
+
+private:
+    DECLARE_EVENT_TABLE()
 };
 
 // -------------------------------------
@@ -358,80 +377,174 @@ private:
 // MyApp
 // -------------------------------------
 
-#define DYNAMIC_QUIT   wxID_EXIT
+IMPLEMENT_APP(MyApp)
-#define DYNAMIC_ABOUT  wxID_ABOUT
-
-IMPLEMENT_APP  (MyApp)
 
 bool MyApp::OnInit(void)
 {
     if ( !wxApp::OnInit() )
         return false;
 
-    MyFrame *frame = new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 800, 340);
+    // build the first frame
+    MyFrame *frame = 
+        new MyFrame(NULL, wxT("wxDataViewCtrl feature test"), 10, 10, 800, 340);
     frame->Show(true);
 
-    MySortingFrame *frame2 = new MySortingFrame(NULL, wxT("wxDataViewCtrl sorting test"), 10, 150, 600, 500);
-    frame2->Show(true);
-
     SetTopWindow(frame);
-    
     return true;
 }
 
+int MyApp::OnExit()
+{
+    return 0;
+}
+
+
 // -------------------------------------
 // MyFrame
 // -------------------------------------
 
+enum
+{
+    // file menu
+    ID_ABOUT = wxID_ABOUT,
+    ID_NEW_SORT_FRAME,
+    ID_EXIT = wxID_EXIT,
+
+    // dataviewctrl menu
+    ID_SINGLE_SEL_MODE,
+    ID_MULTIPLE_SEL_MODE,
+
+    ID_RESIZEABLE_COLUMNS,
+    ID_SORTABLE_COLUMNS,
+    ID_HIDDEN_COLUMNS,
+
+    ID_CHOOSE_ALIGNMENT
+};
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+
+    // file menu
+    EVT_MENU( ID_ABOUT, MyFrame::OnAbout )
+    EVT_MENU( ID_NEW_SORT_FRAME, MyFrame::OnNewSortingFrame )
+    EVT_MENU( ID_EXIT, MyFrame::OnQuit )
+
+    // dataviewctrl menu
+    EVT_MENU( ID_SINGLE_SEL_MODE, MyFrame::OnSingleSelMode )
+    EVT_MENU( ID_MULTIPLE_SEL_MODE, MyFrame::OnMultipleSelMode )
+
+    EVT_MENU( ID_RESIZEABLE_COLUMNS, MyFrame::OnResizeableColumn )
+    EVT_MENU( ID_SORTABLE_COLUMNS, MyFrame::OnSortableColumn )
+    EVT_MENU( ID_HIDDEN_COLUMNS, MyFrame::OnHideColumn )
+
+    EVT_MENU( ID_CHOOSE_ALIGNMENT, MyFrame::OnChooseAlign )
+
+END_EVENT_TABLE()
+
 MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
   wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
     SetIcon(wxICON(sample));
 
-    wxMenu *file_menu = new wxMenu;
+    // build the menus:
+
+    wxMenu *file_menu = new wxMenu;
+    file_menu->Append(ID_NEW_SORT_FRAME, _T("&New sorting frame"));
+    file_menu->AppendSeparator();
+    file_menu->Append(ID_ABOUT, _T("&About"));
+    file_menu->AppendSeparator();
+    file_menu->Append(ID_EXIT, _T("E&xit"));
+
+    wxMenu *data_menu = new wxMenu;
+    data_menu->AppendRadioItem(ID_SINGLE_SEL_MODE, _T("&Single selection mode"));
+    data_menu->AppendRadioItem(ID_MULTIPLE_SEL_MODE, _T("&Multiple selection mode"));
+    data_menu->AppendSeparator();
+    data_menu->AppendCheckItem(ID_RESIZEABLE_COLUMNS, _T("Make columns resizeable"));
+    data_menu->AppendCheckItem(ID_SORTABLE_COLUMNS, _T("Make columns sortable"));
+    data_menu->AppendCheckItem(ID_HIDDEN_COLUMNS, _T("Make columns hidden"));
+    data_menu->AppendSeparator();
+    data_menu->Append(ID_CHOOSE_ALIGNMENT, _T("Set alignment..."));
 
-    file_menu->Append(DYNAMIC_ABOUT, _T("&About"));
-    file_menu->Append(DYNAMIC_QUIT, _T("E&xit"));
     wxMenuBar *menu_bar = new wxMenuBar;
     menu_bar->Append(file_menu, _T("&File"));
+    menu_bar->Append(data_menu, _T("&DataViewCtrl"));
+
     SetMenuBar(menu_bar);
-
-    // You used to have to do some casting for param 4, but now there are type-safe handlers
-    Connect( DYNAMIC_QUIT,  wxID_ANY,
-                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnQuit) );
-    Connect( DYNAMIC_ABOUT, wxID_ANY,
-                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MyFrame::OnAbout) );
-
     CreateStatusBar();
 
-    wxPanel *panel = new wxPanel( this, wxID_ANY );
+
+    // build the other controls:
+
+    m_splitter = new wxSplitterWindow( this, wxID_ANY );
+    m_splitter->SetSashGravity(0.5);
+
+    m_align = wxALIGN_CENTER;
+    dataview_left = dataview_right = NULL;
+    CreateControls();
+
+    m_splitter->SplitVertically(dataview_left, dataview_right);
+}
+
+void MyFrame::CreateControls()
+{
+    wxDataViewCtrl *old1 = NULL, *old2 = NULL;
+
+    if (dataview_left)
+        old1 = dataview_left;
+    if (dataview_right)
+        old2 = dataview_right;
+
+    // styles:
+
+    long style = 0;
+    if (GetMenuBar()->FindItem(ID_MULTIPLE_SEL_MODE)->IsChecked())
+        style |= wxDV_MULTIPLE;
+
+    int flags = 0;
+    if (GetMenuBar()->FindItem(ID_RESIZEABLE_COLUMNS)->IsChecked())
+        flags |= wxDATAVIEW_COL_RESIZABLE;
+    if (GetMenuBar()->FindItem(ID_SORTABLE_COLUMNS)->IsChecked())
+        flags |= wxDATAVIEW_COL_SORTABLE;
+    if (GetMenuBar()->FindItem(ID_HIDDEN_COLUMNS)->IsChecked())
+        flags |= wxDATAVIEW_COL_HIDDEN;
 
 
     // Left wxDataViewCtrl
-    dataview_left = new wxDataViewCtrl( panel, wxID_ANY );
+    dataview_left = new wxDataViewCtrl( m_splitter, wxID_ANY, wxDefaultPosition,
+                                        wxDefaultSize, style );
 
     MyTextModel *model = new MyTextModel;
     dataview_left->AssociateModel( model );
+    model->DecRef(); // don't leak memory
 
-    dataview_left->AppendTextColumn( wxT("first"), 0 );
+    dataview_left->AppendTextColumn( wxT("first"), 0, wxDATAVIEW_CELL_INERT, -1, 
-    dataview_left->AppendTextColumn( wxT("second"), 1 );
+                                     m_align, flags );
+    dataview_left->AppendTextColumn( wxT("second"), 1, wxDATAVIEW_CELL_INERT, -1, 
+                                     m_align, flags );
 
-    wxDataViewTextRenderer *text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
+    wxDataViewTextRenderer *text_renderer = 
-    wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_renderer, 2 );
+        new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
+    wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_renderer, 2,
+                                                     -1, m_align, flags );
     dataview_left->AppendColumn( column );
 
-    dataview_left->AppendToggleColumn( wxT("fourth"), 3 );
+    dataview_left->AppendToggleColumn( wxT("fourth"), 3, wxDATAVIEW_CELL_INERT, -1,  
+                                       m_align, flags );
 
     MyCustomRenderer *custom_renderer = new MyCustomRenderer;
-    column = new wxDataViewColumn( wxT("custom"), custom_renderer, 4 );
+    column = new wxDataViewColumn( wxT("custom"), custom_renderer, 4, -1,  
+                                   m_align, flags );
     dataview_left->AppendColumn( column );
 
-    dataview_left->AppendProgressColumn( wxT("progress"), 5 );
+    dataview_left->AppendProgressColumn( wxT("progress"), 5, wxDATAVIEW_CELL_INERT, -1,  
+                                         m_align, flags );
+
+    dataview_left->AppendDateColumn( wxT("date"), 6, wxDATAVIEW_CELL_INERT, -1,  
+                                     m_align, flags );
 
-    dataview_left->AppendDateColumn( wxT("date"), 6 );
 
     // Right wxDataViewCtrl using the same model
-    dataview_right = new wxDataViewCtrl( panel, wxID_ANY );
+    dataview_right = new wxDataViewCtrl( m_splitter, wxID_ANY, wxDefaultPosition,
+                                         wxDefaultSize, style );
     dataview_right->AssociateModel( model );
 
     text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
@@ -439,19 +552,25 @@ MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
     dataview_right->AppendColumn( column );
     dataview_right->AppendTextColumn( wxT("first"), 0 );
     dataview_right->AppendTextColumn( wxT("second"), 1 );
-    wxDataViewToggleRenderer *toggle_renderer = new wxDataViewToggleRenderer( wxT("bool"), wxDATAVIEW_CELL_ACTIVATABLE );
+    wxDataViewToggleRenderer *toggle_renderer = 
+        new wxDataViewToggleRenderer( wxT("bool"), wxDATAVIEW_CELL_ACTIVATABLE );
     column = new wxDataViewColumn( wxT("bool"), toggle_renderer, 3, 30 );
     dataview_right->AppendColumn( column );
 
     dataview_right->AppendDateColumn( wxT("date"), 6 );
 
-    // layout dataview controls.
+    // layout dataview controls
+    if (old1)
+    {
+        m_splitter->ReplaceWindow(old1, dataview_left);
+        delete old1;
+    }
 
-    wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL );
+    if (old2)
-    sizer->Add( dataview_left, 3, wxGROW );
+    {
-    sizer->Add(10,10);
+        m_splitter->ReplaceWindow(old2, dataview_right);
-    sizer->Add( dataview_right, 2, wxGROW );
+        delete old2;
-    panel->SetSizer( sizer );
+    }
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
@@ -461,12 +580,84 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-    wxMessageDialog dialog(this, _T("This demonstrates the dataview control handling"),
+    wxAboutDialogInfo info;
-        _T("About DataView"), wxOK);
+    info.SetName(_("DataView sample"));
+    info.SetDescription(_("This sample demonstrates the dataview control handling"));
+    info.SetCopyright(_T("(C) 2007 Robert Roebling"));
 
-    dialog.ShowModal();
+    wxAboutBox(info);
 }
 
+void MyFrame::OnNewSortingFrame(wxCommandEvent& WXUNUSED(event) )
+{
+    MySortingFrame *frame2 = 
+        new MySortingFrame(NULL, wxT("wxDataViewCtrl sorting test"), 10, 150, 600, 500);
+    frame2->Show(true);
+}
+
+void MyFrame::OnSingleSelMode(wxCommandEvent& event)
+{
+    CreateControls();
+}
+
+void MyFrame::OnMultipleSelMode(wxCommandEvent& event)
+{
+    CreateControls();
+}
+
+void MyFrame::OnResizeableColumn(wxCommandEvent& event)
+{
+    CreateControls();
+}
+
+void MyFrame::OnSortableColumn(wxCommandEvent& event)
+{
+    CreateControls();
+}
+
+void MyFrame::OnHideColumn(wxCommandEvent& event)
+{
+    CreateControls();
+}
+
+void MyFrame::OnChooseAlign(wxCommandEvent& event)
+{
+    const wxString choices[] =
+    {
+        wxT("Left"),
+        wxT("Center horizontally"),
+        wxT("Right"),
+        wxT("Top"),
+        wxT("Center vertically"),
+        wxT("Bottom"),
+        wxT("Center")
+    };
+
+    wxAlignment flags[] =
+    {
+        wxALIGN_LEFT,
+        wxALIGN_CENTER_HORIZONTAL,
+        wxALIGN_RIGHT,
+        wxALIGN_TOP,
+        wxALIGN_CENTER_VERTICAL,
+        wxALIGN_BOTTOM,
+        wxALIGN_CENTER
+    };
+
+    int choice = wxGetSingleChoiceIndex(
+        wxT("Select the alignment for the cells of the wxDataViewCtrl:"),
+        wxT("Alignment"),
+        WXSIZEOF(choices), choices,
+        this);
+
+    if (choice == wxNOT_FOUND)
+        return;
+
+    m_align = flags[choice];
+    CreateControls();
+}
+
+
 // -------------------------------------
 // MySortingFrame
 // -------------------------------------
@@ -491,43 +682,39 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
     m_logOld = NULL;
     
     SetIcon(wxICON(sample));
-
-    wxMenu *file_menu = new wxMenu;
-
-    file_menu->Append(DYNAMIC_ABOUT, _T("&About"));
-    file_menu->Append(DYNAMIC_QUIT, _T("E&xit"));
-    wxMenuBar *menu_bar = new wxMenuBar;
-    menu_bar->Append(file_menu, _T("&File"));
-    SetMenuBar(menu_bar);
-
-    // You used to have to do some casting for param 4, but now there are type-safe handlers
-    Connect( DYNAMIC_QUIT,  wxID_ANY,
-                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MySortingFrame::OnQuit) );
-    Connect( DYNAMIC_ABOUT, wxID_ANY,
-                    wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MySortingFrame::OnAbout) );
-
     CreateStatusBar();
 
+    wxPanel *main = new wxPanel(this);
 
     // Left wxDataViewCtrl
-    dataview_left = new wxDataViewCtrl( this, ID_UNSORTED, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE );
+    dataview_left = new wxDataViewCtrl( main, ID_UNSORTED, wxDefaultPosition, 
+                                        wxDefaultSize, wxDV_MULTIPLE );
 
     m_unsorted_model = new MyUnsortedTextModel;
     dataview_left->AssociateModel( m_unsorted_model );
-    wxDataViewTextRenderer *text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
+    m_unsorted_model->DecRef(); // don't leak memory
+
+    wxDataViewTextRenderer *text_renderer = 
+        new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
     wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_renderer, 0 );
     dataview_left->AppendColumn( column );
     dataview_left->AppendTextColumn( wxT("second"), 1 );
-    dataview_left->AppendColumn( new wxDataViewColumn( wxBitmap(null_xpm), new wxDataViewBitmapRenderer, 2, 25 ) );
+    dataview_left->AppendColumn( new wxDataViewColumn( wxBitmap(null_xpm), 
-    dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), new wxDataViewBitmapRenderer, 3, 25 ) );
+                                 new wxDataViewBitmapRenderer, 2, 25 ) );
+    dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), 
+                                 new wxDataViewBitmapRenderer, 3, 25 ) );
 
     // Right wxDataViewCtrl using the sorting model
-    dataview_right = new wxDataViewCtrl( this, ID_SORTED );
+    dataview_right = new wxDataViewCtrl( main, ID_SORTED );
     
     m_sorted_model = new wxDataViewSortedListModel( m_unsorted_model );
     dataview_right->AssociateModel( m_sorted_model );
+    m_sorted_model->DecRef(); // don't leak memory
+
     text_renderer = new wxDataViewTextRenderer( wxT("string"), wxDATAVIEW_CELL_EDITABLE );
-    column = new wxDataViewColumn( wxT("editable"), text_renderer, 0, -1, wxDATAVIEW_COL_SORTABLE|wxDATAVIEW_COL_RESIZABLE );
+    column = new wxDataViewColumn( wxT("editable"), text_renderer, 0, -1, 
+                                   wxALIGN_CENTER,
+                                   wxDATAVIEW_COL_SORTABLE|wxDATAVIEW_COL_RESIZABLE );
     dataview_right->AppendColumn( column );
     
     dataview_right->AppendTextColumn( wxT("second"), 1 );
@@ -542,22 +729,22 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
     wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
     button_sizer->Add( 10, 10, 1 );
     wxFlexGridSizer *left_sizer = new wxFlexGridSizer( 2 );
-    left_sizer->Add( new wxButton( this, ID_APPEND_ROW_LEFT, wxT("Append") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( main, ID_APPEND_ROW_LEFT, wxT("Append") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( this, ID_PREPEND_ROW_LEFT, wxT("Prepend") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( main, ID_PREPEND_ROW_LEFT, wxT("Prepend") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( this, ID_INSERT_ROW_LEFT, wxT("Insert") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( main, ID_INSERT_ROW_LEFT, wxT("Insert") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( this, ID_DELETE_ROW_LEFT, wxT("Delete second") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( main, ID_DELETE_ROW_LEFT, wxT("Delete second") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( this, ID_EDIT_ROW_LEFT, wxT("Edit") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( main, ID_EDIT_ROW_LEFT, wxT("Edit") ), 0, wxALL, 5 );
     left_sizer->Add( 5,5 );
-    left_sizer->Add( new wxButton( this, ID_SELECT, wxT("Select third") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( main, ID_SELECT, wxT("Select third") ), 0, wxALL, 5 );
-    left_sizer->Add( new wxButton( this, ID_UNSELECT_ALL, wxT("Unselect all") ), 0, wxALL, 5 );
+    left_sizer->Add( new wxButton( main, ID_UNSELECT_ALL, wxT("Unselect all") ), 0, wxALL, 5 );
     button_sizer->Add( left_sizer );
     button_sizer->Add( 10, 10, 2 );
     wxFlexGridSizer *right_sizer = new wxFlexGridSizer( 2 );
-    right_sizer->Add( new wxButton( this, ID_APPEND_ROW_RIGHT, wxT("Append") ), 0, wxALL, 5 );
+    right_sizer->Add( new wxButton( main, ID_APPEND_ROW_RIGHT, wxT("Append") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( this, ID_PREPEND_ROW_RIGHT, wxT("Prepend") ), 0, wxALL, 5 );
+    right_sizer->Add( new wxButton( main, ID_PREPEND_ROW_RIGHT, wxT("Prepend") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( this, ID_INSERT_ROW_RIGHT, wxT("Insert") ), 0, wxALL, 5 );
+    right_sizer->Add( new wxButton( main, ID_INSERT_ROW_RIGHT, wxT("Insert") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( this, ID_DELETE_ROW_RIGHT, wxT("Delete second") ), 0, wxALL, 5 );
+    right_sizer->Add( new wxButton( main, ID_DELETE_ROW_RIGHT, wxT("Delete second") ), 0, wxALL, 5 );
-    right_sizer->Add( new wxButton( this, ID_EDIT_ROW_RIGHT, wxT("Edit") ), 0, wxALL, 5 );
+    right_sizer->Add( new wxButton( main, ID_EDIT_ROW_RIGHT, wxT("Edit") ), 0, wxALL, 5 );
     button_sizer->Add( right_sizer );
     button_sizer->Add( 10, 10, 1 );
 
@@ -565,7 +752,7 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
     main_sizer->Add( top_sizer, 1, wxGROW );
     main_sizer->Add( button_sizer, 0, wxGROW );
     
-    m_logWindow = new wxTextCtrl(this, wxID_ANY, wxEmptyString,
+    m_logWindow = new wxTextCtrl(main, wxID_ANY, wxEmptyString,
                                  wxDefaultPosition, wxDefaultSize,
                                  wxTE_MULTILINE | wxSUNKEN_BORDER);
     main_sizer->Add( 20,20 );
@@ -573,7 +760,7 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
 
     m_logOld = wxLog::SetActiveTarget(new wxLogTextCtrl(m_logWindow));
 
-    SetSizer( main_sizer );
+    main->SetSizer( main_sizer );
 }
 
 MySortingFrame::~MySortingFrame()
@@ -625,7 +812,8 @@ void MySortingFrame::OnHeaderClickSorted(wxDataViewEvent &event)
 
 void MySortingFrame::OnHeaderClickUnsorted(wxDataViewEvent &event)
 {
-    wxLogMessage( wxT("OnHeaderClick from unsorted list, column %s"), event.GetDataViewColumn()->GetTitle().c_str() );
+    wxLogMessage( wxT("OnHeaderClick from unsorted list, column %s"), 
+                  event.GetDataViewColumn()->GetTitle().c_str() );
 }
 
 void MySortingFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )

src/common/datavcmn.cpp

@@ -25,18 +25,11 @@
 
 const wxChar wxDataViewCtrlNameStr[] = wxT("dataviewCtrl");
 
-// ---------------------------------------------------------
-// wxDataViewModel
-// ---------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewModel, wxObject)
 
 // ---------------------------------------------------------
 // wxDataViewListModel
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewListModel, wxDataViewModel)
-
 wxDataViewListModel::wxDataViewListModel()
 {
     m_viewingColumns.DeleteContents( true );
@@ -45,6 +38,13 @@ wxDataViewListModel::wxDataViewListModel()
 
 wxDataViewListModel::~wxDataViewListModel()
 {
+    wxList::compatibility_iterator node = m_notifiers.GetFirst();
+    while (node)
+    {
+        wxDataViewListModelNotifier* notifier = (wxDataViewListModelNotifier*) node->GetData();
+        notifier->Freed();
+        node = node->GetNext();
+    }
 }
 
 bool wxDataViewListModel::RowAppended()
@@ -242,6 +242,9 @@ public:
     virtual bool Cleared()
         { return m_model->ChildCleared(); }
 
+    virtual bool Freed()
+        { m_model->m_child = NULL; return wxDataViewListModelNotifier::Freed(); }
+
     wxDataViewSortedListModel *m_model;
 };
 
@@ -306,8 +309,6 @@ int LINKAGEMODE wxDataViewIntermediateCmp( unsigned int row1, unsigned int row2
 // wxDataViewSortedListModel
 // ---------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxDataViewSortedListModel, wxDataViewListModel)
-
 wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child ) :
   m_array( wxDataViewIntermediateCmp )
 {
@@ -323,6 +324,7 @@ wxDataViewSortedListModel::wxDataViewSortedListModel( wxDataViewListModel *child
 
 wxDataViewSortedListModel::~wxDataViewSortedListModel()
 {
+    if (m_child)
     m_child->RemoveNotifier( m_notifierOnChild );
 }
 
@@ -715,6 +717,7 @@ wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
                                            wxDataViewRenderer *renderer,
                                            unsigned int model_column,
                                            int WXUNUSED(width),
+                                           wxAlignment WXUNUSED(align),
                                            int flags ) 
 {
     m_renderer = renderer;
@@ -729,6 +732,7 @@ wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
                                            wxDataViewRenderer *renderer,
                                            unsigned int model_column,
                                            int WXUNUSED(width),
+                                           wxAlignment WXUNUSED(align),
                                            int flags ) 
 {
     m_renderer = renderer;
@@ -784,11 +788,27 @@ wxDataViewCtrlBase::wxDataViewCtrlBase()
 
 wxDataViewCtrlBase::~wxDataViewCtrlBase()
 {
+    // IMPORTANT: before calling DecRef() on our model (since it may 
+    //            result in a free() call), erase all columns (since
+    //            they hold a pointer to our model)
+    m_cols.Clear();
+
+    if (m_model)
+    {
+        m_model->DecRef();
+        m_model = NULL;
+    }
 }
 
 bool wxDataViewCtrlBase::AssociateModel( wxDataViewListModel *model )
 {
+    if ( m_model )
+        m_model->DecRef();   // discard old model, if any
+
+    // add our own reference to the new model:
     m_model = model;
+    if ( m_model )
+        m_model->IncRef(); 
 
     return true;
 }
@@ -799,73 +819,83 @@ wxDataViewListModel* wxDataViewCtrlBase::GetModel()
 }
 
 bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width )
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width ) );
+        new wxDataViewTextRenderer( wxT("string"), mode ), model_column, 
+        width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width )
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width ) );
+        new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, 
+        width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width )
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width ) );
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, 
+        width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width )
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewDateRenderer( wxT("datetime"), mode), model_column, width ) );
+        new wxDataViewDateRenderer( wxT("datetime"), mode), model_column, 
+        width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width )
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width ) );
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, 
+        width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width )
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewTextRenderer( wxT("string"), mode ), model_column, width ) );
+        new wxDataViewTextRenderer( wxT("string"), mode ), model_column, 
+        width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width )
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, width ) );
+        new wxDataViewToggleRenderer( wxT("bool"), mode ), model_column, 
+        width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width )
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, width ) );
+        new wxDataViewProgressRenderer( wxEmptyString, wxT("long"), mode ), model_column, 
+        width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width )
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column, width ) );
+        new wxDataViewDateRenderer( wxT("datetime"), mode ), model_column,
+        width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column,
-                            wxDataViewCellMode mode, int width )
+                            wxDataViewCellMode mode, int width, wxAlignment align, int flags )
 {
     return AppendColumn( new wxDataViewColumn( label, 
-        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, width ) );
+        new wxDataViewBitmapRenderer( wxT("wxBitmap"), mode ), model_column, 
+        width, align, flags ) );
 }
 
 bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )

src/gtk/dataview.cpp

@@ -726,6 +726,13 @@ public:
     virtual bool RowsReordered( unsigned int *new_order );
     virtual bool Cleared();
 
+    virtual bool Freed()
+{
+    m_wx_model = NULL;
+    m_gtk_store = NULL;
+    return wxDataViewListModelNotifier::Freed();
+}
+
     GtkWxListStore      *m_gtk_store;
     wxDataViewListModel *m_wx_model;
 };
@@ -1430,9 +1437,10 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
 
 IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
 
-wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, unsigned int model_column,
+wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *cell, 
-    int width, int flags ) :
+                                    unsigned int model_column, int width, 
-    wxDataViewColumnBase( title, cell, model_column, width, flags )
+                                    wxAlignment align, int flags ) :
+    wxDataViewColumnBase( title, cell, model_column, width, align, flags )
 {
     m_isConnected = false;
 
@@ -1464,11 +1472,13 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *c
     gtk_tree_view_column_set_cell_data_func( column, renderer,
         wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
 
+    SetAlignment(align);
 }
 
-wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, unsigned int model_column,
+wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, 
-    int width, int flags ) :
+                                    unsigned int model_column, int width, 
-    wxDataViewColumnBase( bitmap, cell, model_column, width, flags )
+                                    wxAlignment align, int flags ) :
+    wxDataViewColumnBase( bitmap, cell, model_column, width, align, flags )
 {
     m_isConnected = false;
     
@@ -1497,6 +1507,8 @@ wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *
 
     gtk_tree_view_column_set_cell_data_func( column, renderer,
         wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
+
+    SetAlignment(align);
 }
 
 wxDataViewColumn::~wxDataViewColumn()
@@ -1605,7 +1617,7 @@ void wxDataViewColumn::SetSortable( bool sortable )
     gtk_tree_view_column_set_sort_indicator( column, sortable );
 }
 
-bool wxDataViewColumn::GetSortable()
+bool wxDataViewColumn::IsSortable() const
 {
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
     return gtk_tree_view_column_get_sort_indicator( column );
@@ -1621,14 +1633,14 @@ void wxDataViewColumn::SetSortOrder( bool ascending )
         gtk_tree_view_column_set_sort_order( column, GTK_SORT_DESCENDING );
 }
 
-bool wxDataViewColumn::IsSortOrderAscending()
+bool wxDataViewColumn::IsSortOrderAscending() const
 {
     GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
     
     return (gtk_tree_view_column_get_sort_order( column ) != GTK_SORT_DESCENDING);
 }
 
-int wxDataViewColumn::GetWidth()
+int wxDataViewColumn::GetWidth() const
 {
     return gtk_tree_view_column_get_width( (GtkTreeViewColumn *)m_column );
 }
@@ -1638,7 +1650,7 @@ void wxDataViewColumn::SetFixedWidth( int width )
     gtk_tree_view_column_set_fixed_width( (GtkTreeViewColumn *)m_column, width );
 }
 
-int wxDataViewColumn::GetFixedWidth()
+int wxDataViewColumn::GetFixedWidth() const
 {
     return gtk_tree_view_column_get_fixed_width( (GtkTreeViewColumn *)m_column );
 }
@@ -1680,6 +1692,10 @@ wxDataViewCtrl::~wxDataViewCtrl()
 {
     if (m_notifier)
         GetModel()->RemoveNotifier( m_notifier );
+
+    // remove the model from the GtkTreeView before it gets destroyed by the
+    // wxDataViewCtrlBase's dtor
+    gtk_tree_view_set_model( GTK_TREE_VIEW(m_treeview), NULL );
 }
 
 void wxDataViewCtrl::Init()