From e98351eca92517c55f4c9d706598fefea8604376 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Sun, 19 Aug 2007 20:11:34 +0000
Subject: [PATCH] Made wxGTK wxDataViewCtrl compile again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/dataview.h     | 18 ++++--------------
 include/wx/gtk/dataview.h | 11 +++++++++--
 src/common/datavcmn.cpp   |  1 +
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 86b9199a19..ab4f76b626 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -25,7 +25,7 @@
 
 #if defined(__WXGTK20__)
     // for testing
-    #define wxUSE_GENERICDATAVIEWCTRL 1
+    // #define wxUSE_GENERICDATAVIEWCTRL 1
 #elif defined(__WXMAC__)
 #else
     #define wxUSE_GENERICDATAVIEWCTRL 1
@@ -474,30 +474,18 @@ public:
     int GetIndent() const 
         { return m_indent; } 
 
-    //Selection Code
+    virtual wxDataViewItem GetSelection() = 0;
     virtual int GetSelections( wxDataViewItemArray & sel ) const = 0;
     virtual void SetSelections( const wxDataViewItemArray & sel ) = 0;
     virtual void Select( const wxDataViewItem & item ) = 0;
     virtual void Unselect( const wxDataViewItem & item ) = 0;
     virtual bool IsSelected( const wxDataViewItem & item ) const = 0;
 
-    virtual int GetSelections( wxArrayInt & sel ) const = 0; 
-    virtual void SetSelections( const wxArrayInt & sel ) = 0;
-    virtual void Select( int row ) = 0;
-    virtual void Unselect( int row ) = 0;
-    virtual bool IsSelected( int row ) const = 0;
-    virtual void SelectRange( int from, int to ) = 0;
-    virtual void UnselectRange( int from, int to ) = 0;
-
     virtual void SelectAll() = 0;
     virtual void UnselectAll() = 0;
 
-    virtual void EnsureVisible( int row ) = 0;
     virtual void EnsureVisible( const wxDataViewItem & item ) = 0;
 
-    virtual wxDataViewItem GetItemByRow( unsigned int row ) const = 0;
-    virtual int GetRowByItem( const wxDataViewItem & item ) const = 0;
-
 protected:
     virtual void DoSetExpanderColumn() = 0 ;
     virtual void DoSetIndent() = 0;
@@ -568,6 +556,7 @@ private:
 
 BEGIN_DECLARE_EVENT_TYPES()
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED, -1)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_DESELECTED, -1)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, -1)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED, -1)
     DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED, -1)
@@ -591,6 +580,7 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
     wx__DECLARE_EVT1(wxEVT_COMMAND_DATAVIEW_ ## evt, id, wxDataViewEventHandler(fn))
 
 #define EVT_DATAVIEW_ITEM_SELECTED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_SELECTED, id, fn)
+#define EVT_DATAVIEW_ITEM_DESELECTED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_DESELECTED, id, fn)
 #define EVT_DATAVIEW_ITEM_ACTIVATED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_ACTIVATED, id, fn)
 #define EVT_DATAVIEW_ITEM_COLLAPSED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_COLLAPSED, id, fn)
 #define EVT_DATAVIEW_ITEM_EXPANDED(id, fn) wx__DECLARE_DATAVIEWEVT(ITEM_EXPANDED, id, fn)
diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 197a8e713d..82b5e001a7 100644
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -306,9 +306,16 @@ public:
     virtual bool AssociateModel( wxDataViewModel *model );
     virtual bool AppendColumn( wxDataViewColumn *col );
 
-    // selection code
     virtual wxDataViewItem GetSelection();
-    
+    virtual int GetSelections( wxDataViewItemArray & sel ) const;
+    virtual void SetSelections( const wxDataViewItemArray & sel );
+    virtual void Select( const wxDataViewItem & item );
+    virtual void Unselect( const wxDataViewItem & item );
+    virtual bool IsSelected( const wxDataViewItem & item ) const;
+    virtual void SelectAll();
+    virtual void UnselectAll();
+
+    virtual void EnsureVisible( const wxDataViewItem & item );
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index f98deffbb6..61e31e50b2 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -696,6 +696,7 @@ wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos )
 IMPLEMENT_DYNAMIC_CLASS(wxDataViewEvent,wxNotifyEvent)
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_SELECTED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_DESELECTED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED)
-- 
2.45.2