more compilation fixes after pen/brush styles changes

[wxWidgets.git] / interface / dataview.h

diff --git a/interface/dataview.h b/interface/dataview.h
index 30454f221ce6eccd2a7847b4994d846a16f792cf..e32f513867a027cfb310ca5a9528a6c72b632ca9 100644 (file)
--- a/interface/dataview.h
+++ b/interface/dataview.h
@@ -67,7 +67,7 @@ class wxDataViewEvent : public wxNotifyEvent
 public:
     //@{
     /**
-        
+
     */
     wxDataViewEvent(wxEventType commandType = wxEVT_NULL,
                     int winid = 0);
@@ -107,7 +107,7 @@ public:
     const wxVariant GetValue() const;
 
     /**
-        
+
     */
     void SetColumn(int col);
 
@@ -117,12 +117,12 @@ public:
     void SetDataViewColumn(wxDataViewColumn* col);
 
     /**
-        
+
     */
     void SetModel(wxDataViewModel* model);
 
     /**
-        
+
     */
     void SetValue(const wxVariant& value);
 };
@@ -147,7 +147,7 @@ class wxDataViewIconTextRenderer : public wxDataViewRenderer
 {
 public:
     /**
-        
+
     */
     wxDataViewIconTextRenderer(const wxString& varianttype = "wxDataViewIconText",
                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT);
@@ -582,9 +582,10 @@ public:
     /**
         Override this to react to double clicks or ENTER.
     */
-    virtual bool Activate(wxRect cell, wxDataViewModel* model,
-                          unsigned int col,
-                          unsigned int row);
+    virtual bool Activate( wxRect cell,
+                           wxDataViewModel* model,
+                           const wxDataViewItem & item,
+                           unsigned int col );
 
     /**
         Override this to create the actual editor control once editing
@@ -622,10 +623,11 @@ public:
     /**
         Overrride this to react to a left click.
     */
-    virtual bool LeftClick(wxPoint cursor, wxRect cell,
-                           wxDataViewModel* model,
-                           unsigned int col,
-                           unsigned int row);
+    virtual bool LeftClick( wxPoint cursor,
+                            wxRect cell,
+                            wxDataViewModel * model,
+                            const wxDataViewItem & item,
+                            unsigned int col );
 
     /**
         Override this to render the cell. Before this is called,
@@ -646,18 +648,19 @@ public:
     /**
         Overrride this to react to a right click.
     */
-    virtual bool RightClick(wxPoint cursor, wxRect cell,
+    virtual bool RightClick(wxPoint cursor,
+                            wxRect cell,
                             wxDataViewModel* model,
-                            unsigned int col,
-                            unsigned int row);
+                            const wxDataViewItem & item,
+                            unsigned int col);
 
     /**
         Overrride this to start a drag operation.
     */
     virtual bool StartDrag(wxPoint cursor, wxRect cell,
                            wxDataViewModel* model,
-                           unsigned int col,
-                           unsigned int row);
+                           const wxDataViewItem & item,
+                           unsigned int col);
 };
 
 
@@ -675,7 +678,7 @@ class wxDataViewBitmapRenderer : public wxDataViewRenderer
 {
 public:
     /**
-        
+
     */
     wxDataViewBitmapRenderer(const wxString& varianttype = "wxBitmap",
                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT);
@@ -753,7 +756,7 @@ class wxDataViewItem
 public:
     //@{
     /**
-        
+
     */
     wxDataViewItem(void* id = NULL);
     wxDataViewItem(const wxDataViewItem& item);
@@ -1341,7 +1344,7 @@ class wxDataViewTextRenderer : public wxDataViewRenderer
 {
 public:
     /**
-        
+
     */
     wxDataViewTextRenderer(const wxString& varianttype = "string",
                            wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT);
@@ -1362,7 +1365,7 @@ class wxDataViewProgressRenderer : public wxDataViewRenderer
 {
 public:
     /**
-        
+
     */
     wxDataViewProgressRenderer(const wxString& label = wxEmptyString,
                                const wxString& varianttype = "long",
@@ -1409,7 +1412,7 @@ class wxDataViewToggleRenderer : public wxDataViewRenderer
 {
 public:
     /**
-        
+
     */
     wxDataViewToggleRenderer(const wxString& varianttype = "bool",
                              wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT);
@@ -1453,7 +1456,7 @@ public:
     ~wxDataViewTreeCtrl();
 
     /**
-        
+
     */
     wxDataViewItem AppendContainer(const wxDataViewItem& parent,
                                    const wxString& text,
@@ -1462,7 +1465,7 @@ public:
                                    wxClientData* data = NULL);
 
     /**
-        
+
     */
     wxDataViewItem AppendItem(const wxDataViewItem& parent,
                               const wxString& text,
@@ -1766,7 +1769,7 @@ class wxDataViewDateRenderer : public wxDataViewRenderer
 {
 public:
     /**
-        
+
     */
     wxDataViewDateRenderer(const wxString& varianttype = "datetime",
                            wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE);
@@ -1792,7 +1795,7 @@ class wxDataViewTextRendererAttr : public wxDataViewTextRenderer
 {
 public:
     /**
-        
+
     */
     wxDataViewTextRendererAttr(const wxString& varianttype = "string",
                                wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,