Allow using socket from both wxBase and wxCore (adopting to changes from r50831)

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

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 10e8bbf97044847de2fd922344695015d3a004f5..51faf5f7c2de4d49212efb8dd90b90bb3f6ca1e8 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -328,7 +328,7 @@ public:
     virtual void SetResizeable( bool resizeable );
     virtual void SetHidden( bool hidden );
     virtual void SetSortOrder( bool ascending );
     virtual void SetResizeable( bool resizeable );
     virtual void SetHidden( bool hidden );
     virtual void SetSortOrder( bool ascending );

-
+    virtual void SetReorderable( bool reorderable );

 
     // getters:
 
 
     // getters:
 


@@ -347,7 +347,8 @@ public:
     virtual bool IsHidden() const
         { return (m_flags & wxDATAVIEW_COL_HIDDEN) != 0; }
     virtual bool IsSortOrderAscending() const;
     virtual bool IsHidden() const
         { return (m_flags & wxDATAVIEW_COL_HIDDEN) != 0; }
     virtual bool IsSortOrderAscending() const;

-
+    virtual bool IsReorderable() const
+        { return (m_flags & wxDATAVIEW_COL_REORDERABLE) != 0; }

 
 private:
     int                      m_width;
 
 private:
     int                      m_width;


@@ -468,6 +469,9 @@ public:     // utility functions not part of the API
         return GetClientSize().GetWidth() / GetColumnCount();
     }
 
         return GetClientSize().GetWidth() / GetColumnCount();
     }
 

+    // called by header window after reorder
+    void ColumnMoved( wxDataViewColumn* col, unsigned int new_pos );
+

     // updates the header window after a change in a column setting
     void OnColumnChange();
 
     // updates the header window after a change in a column setting
     void OnColumnChange();