added wxXmlResource::FindXRCIDById() (#10026)

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 6b14e807a3004711f62a4a595f2540b9fd6a5e32..de5b2255817935ae3ebe04bcb3429d4e351b78d0 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -389,8 +389,6 @@ class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase,
 public:
     wxDataViewCtrl() : wxScrollHelperNative(this)
     {
 public:
     wxDataViewCtrl() : wxScrollHelperNative(this)
     {

-        //No sorting column at start, I think
-        m_sortingColumn = NULL;

         Init();
     }
 
         Init();
     }
 


@@ -400,7 +398,6 @@ public:
            const wxValidator& validator = wxDefaultValidator )
              : wxScrollHelperNative(this)
     {
            const wxValidator& validator = wxDefaultValidator )
              : wxScrollHelperNative(this)
     {

-        m_sortingColumn = NULL;

         Create(parent, id, pos, size, style, validator );
     }
 
         Create(parent, id, pos, size, style, validator );
     }
 


@@ -414,8 +411,10 @@ public:
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewModel *model );
            const wxValidator& validator = wxDefaultValidator );
 
     virtual bool AssociateModel( wxDataViewModel *model );

+    

     virtual bool AppendColumn( wxDataViewColumn *col );
     virtual bool PrependColumn( wxDataViewColumn *col );
     virtual bool AppendColumn( wxDataViewColumn *col );
     virtual bool PrependColumn( wxDataViewColumn *col );

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

 
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
 
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();


@@ -488,6 +487,7 @@ private:
 
 private:
     void OnSize( wxSizeEvent &event );
 
 private:
     void OnSize( wxSizeEvent &event );

+    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size);

 
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through
 
     // we need to return a special WM_GETDLGCODE value to process just the
     // arrows but let the other navigation characters through