really fix the length of the string returned by wxConvertStringToOle() (#10056)

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

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 53a0c72ac5754f29d60946390aaca4686d58d603..9e3f259f5fcd226c5a623f29aac182d7d09f90fb 100644 (file)
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -946,6 +946,13 @@ public:
     virtual void HitTest(const wxPoint& point, wxDataViewItem& item,
                          wxDataViewColumn*& col) const;
 
+    /**
+        Return @true if the item is expanded.
+        
+        Currently not supported by OS X.
+    */
+    virtual bool IsExpanded(const wxDataViewItem& item) const;
+
     /**
         Return @true if the item is selected.
     */
@@ -1513,7 +1520,7 @@ public:
     */
     wxDataViewBitmapRenderer(const wxString& varianttype = "wxBitmap",
                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                             int align = wxDVR_DEFAULT_ALIGNMENT,
+                             int align = wxDVR_DEFAULT_ALIGNMENT);
 };
 
 
@@ -1532,7 +1539,7 @@ enum wxDataViewColumnFlags
     @class wxDataViewColumn
 
     This class represents a column in a wxDataViewCtrl.
-    One wxDataViewColumn is bound to one column in the data model, to which the
+    One wxDataViewColumn is bound to one column in the data model to which the
     wxDataViewCtrl has been associated.
 
     An instance of wxDataViewRenderer is used by this class to render its data.
@@ -1540,7 +1547,7 @@ enum wxDataViewColumnFlags
     @library{wxadv}
     @category{dvc}
 */
-class wxDataViewColumn : public wxObject
+class wxDataViewColumn : public wxHeaderColumn
 {
 public:
     //@{
@@ -1561,16 +1568,6 @@ public:
                      int flags = wxDATAVIEW_COL_RESIZABLE);
     //@}
 
-    /**
-        Destructor.
-    */
-    virtual ~wxDataViewColumn();
-
-    /**
-        Returns the bitmap in the header of the column, if any.
-    */
-    const wxBitmap& GetBitmap() const;
-
     /**
         Returns the index of the column of the model, which this
         wxDataViewColumn is displaying.
@@ -1588,68 +1585,6 @@ public:
         @see wxDataViewRenderer.
     */
     wxDataViewRenderer* GetRenderer() const;
-
-    /**
-        Returns @true if the column is reorderable.
-    */
-    virtual bool IsReorderable() const;
-
-    /**
-        Returns @true if the column is sortable.
-
-        @see SetSortable()
-    */
-    virtual bool IsSortable() const;
-
-    /**
-        Returns the width of the column.
-    */
-    virtual int GetWidth() const;
-
-    /**
-        Returns @true, if the sort order is ascending.
-
-        @see SetSortOrder()
-    */
-    virtual bool IsSortOrderAscending() const;
-
-    /**
-        Set the alignment of the column header.
-    */
-    virtual void SetAlignment(wxAlignment align);
-
-    /**
-        Set the bitmap of the column header.
-    */
-    virtual void SetBitmap(const wxBitmap& bitmap);
-
-    /**
-        Indicate wether the column can be reordered by the user using the mouse.
-        This is typically implemented visually by dragging the header button around.
-    */
-    virtual void SetReorderable(bool reorderable);
-
-    /**
-        Indicate the sort order if the implementation of the wxDataViewCtrl supports
-        it, most commonly by showing a little arrow.
-    */
-    virtual void SetSortOrder(bool ascending);
-
-    /**
-        Indicate that the column is sortable.
-        This does not show any sorting indicate yet, but it does make the column
-        header clickable. Call SetSortOrder() afterwards to actually make the sort
-        indicator appear.
-
-        If @a sortable is @false, the column header is no longer clickable and
-        the sort indicator (little arrow) will disappear.
-    */
-    virtual void SetSortable(bool sortable);
-
-    /**
-        Set the title of the column header to @a title.
-    */
-    virtual void SetTitle(const wxString& title);
 };