was incorrectly forcing the font to 12 in most cases, fixes #4745

[wxWidgets.git] / interface / dataview.h

diff --git a/interface/dataview.h b/interface/dataview.h
index e09f63f0eeee7f84efb07af45f8c0eee1b5c59ac..533e8ec36bd16e4168f98953d333b735a379cdb3 100644 (file)
--- a/interface/dataview.h
+++ b/interface/dataview.h
@@ -16,7 +16,7 @@
     a wxVariant.
 
     @library{wxbase}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewIconText : public wxObject
 {
@@ -60,7 +60,7 @@ public:
     wxDataViewEvent - the event class for the wxDataViewCtrl notifications
 
     @library{wxadv}
-    @category{FIXME}
+    @category{events,dvc}
 */
 class wxDataViewEvent : public wxNotifyEvent
 {
@@ -126,6 +126,9 @@ public:
     */
     void SetValue(const wxVariant& value);
 };
+
+
+
 /**
     @class wxDataViewModel
     @wxheader{dataview.h}
@@ -210,7 +213,7 @@ public:
 
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewModel : public wxObjectRefData
 {
@@ -392,7 +395,6 @@ public:
 
 
 
-
 /**
     @class wxDataViewIndexListModel
     @wxheader{dataview.h}
@@ -409,7 +411,7 @@ public:
     use a virtual control.
 
     @library{wxbase}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewIndexListModel : public wxDataViewModel
 {
@@ -526,7 +528,7 @@ public:
     @see wxDataViewIndexListModel for the API.
 
     @library{wxbase}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewVirtualListModel : public wxDataViewModel
 {
@@ -535,9 +537,7 @@ public:
         Constructor.
     */
     wxDataViewVirtualListModel(unsigned int initial_size = 0);
-}
-
-
+};
 
 
 
@@ -554,7 +554,7 @@ public:
     wxDataViewTextRendererText().
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewItemAttr
 {
@@ -604,7 +604,7 @@ public:
     wxDataViewModel::GetChildren.
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewItem
 {
@@ -676,26 +676,30 @@ public:
            Display fine rules between row if supported.
     @style{wxDV_VERT_RULES}
            Display fine rules between columns is supported.
+    @style{wxDV_VARIABLE_LINE_HEIGHT}
+           Allow variable line heights. This can be inefficient when displaying large number of items.
     @endStyleTable
 
     @library{wxadv}
-    @category{ctrl}
-    @appearance{dataviewctrl.png}
+    @category{ctrl,dvc}
+    <!-- @appearance{dataviewctrl.png} -->
 */
 class wxDataViewCtrl : public wxControl
 {
 public:
-    //@{
     /**
-        Constructor. Calls Create().
+        Default Constructor.
     */
     wxDataViewCtrl();
+    
+    /**
+        Constructor. Calls Create().
+    */
     wxDataViewCtrl(wxWindow* parent, wxWindowID id,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator);
-    //@}
 
     /**
         Destructor.
@@ -703,13 +707,24 @@ public:
     ~wxDataViewCtrl();
 
     /**
-        Add a wxDataViewColumn to the control. Returns
-        @e @true on success.
+        Appends a wxDataViewColumn to the control. Returns @true on success.
         Note that there is a number of short cut methods which implicitly create
         a wxDataViewColumn and a wxDataViewRenderer for it (see below).
     */
     virtual bool AppendColumn(wxDataViewColumn* col);
 
+    /**
+        Prepends a wxDataViewColumn to the control. Returns @true on success.
+        Note that there is a number of short cut methods which implicitly create
+        a wxDataViewColumn and a wxDataViewRenderer for it.
+    */
+    virtual bool PrependColumn(wxDataViewColumn* col);
+
+    /**
+        Inserts a wxDataViewColumn to the control. Returns @true on success.
+    */
+    virtual bool InsertColumn(unsigned int pos, wxDataViewColumn* col);
+    
     //@{
     /**
         Appends a column for rendering a bitmap. Returns the wxDataViewColumn
@@ -1003,7 +1018,7 @@ public:
     information.
 
     @library{wxbase}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewModelNotifier
 {
@@ -1134,7 +1149,7 @@ public:
 
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewRenderer : public wxObject
 {
@@ -1219,7 +1234,7 @@ public:
     in-place editing if desired.
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewTextRenderer : public wxDataViewRenderer
 {
@@ -1246,7 +1261,7 @@ public:
     operator.
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewIconTextRenderer : public wxDataViewRenderer
 {
@@ -1261,8 +1276,6 @@ public:
 
 
 
-
-
 /**
     @class wxDataViewProgressRenderer
     @wxheader{dataview.h}
@@ -1270,7 +1283,7 @@ public:
     wxDataViewProgressRenderer
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewProgressRenderer : public wxDataViewRenderer
 {
@@ -1295,7 +1308,7 @@ public:
     The renderer only support variants of type @e long.
 
     @library{wxbase}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewSpinRenderer : public wxDataViewCustomRenderer
 {
@@ -1318,7 +1331,7 @@ public:
     wxDataViewToggleRenderer
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewToggleRenderer : public wxDataViewRenderer
 {
@@ -1339,7 +1352,7 @@ public:
     wxDataViewDateRenderer
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewDateRenderer : public wxDataViewRenderer
 {
@@ -1365,7 +1378,7 @@ public:
     wxDataViewItemAttr.
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewTextRendererAttr : public wxDataViewTextRenderer
 {
@@ -1379,6 +1392,7 @@ public:
 };
 
 
+
 /**
     @class wxDataViewCustomRenderer
     @wxheader{dataview.h}
@@ -1400,7 +1414,7 @@ public:
     in order to end the editing.
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewCustomRenderer : public wxDataViewRenderer
 {
@@ -1504,7 +1518,7 @@ public:
     wxDataViewBitmapRenderer
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewBitmapRenderer : public wxDataViewRenderer
 {
@@ -1519,7 +1533,6 @@ public:
 
 
 
-
 /**
     @class wxDataViewColumn
     @wxheader{dataview.h}
@@ -1532,7 +1545,7 @@ public:
     this class to render its data.
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewColumn : public wxObject
 {
@@ -1660,8 +1673,8 @@ public:
     to the wxDataViewCtrl class simpler.
 
     @library{wxbase}
-    @category{ctrl}
-    @appearance{dataviewtreectrl.png}
+    @category{ctrl,dvc}
+    <!-- @appearance{dataviewtreectrl.png} -->
 */
 class wxDataViewTreeCtrl : public wxDataViewCtrl
 {
@@ -1851,7 +1864,7 @@ public:
     This comes at the price of much reduced flexibility.
 
     @library{wxadv}
-    @category{FIXME}
+    @category{dvc}
 */
 class wxDataViewTreeStore : public wxDataViewModel
 {
@@ -1982,5 +1995,3 @@ public:
     void SetItemIcon(const wxDataViewItem& item, const wxIcon& icon);
 };
 
-
-