moving tlw list up, cleanup

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index c4d58749374a037bf27ceb3ed6b91d05dc586f9f..5e50b0a00e3c60220a7326d8da75f3bbed6b04ee 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -24,6 +24,8 @@
 #include "wx/icon.h"
 #include "wx/imaglist.h"
 
 #include "wx/icon.h"
 #include "wx/imaglist.h"
 

+class WXDLLIMPEXP_FWD_CORE wxDataFormat;
+

 #if defined(__WXGTK20__)
     // for testing
     // #define wxUSE_GENERICDATAVIEWCTRL 1
 #if defined(__WXGTK20__)
     // for testing
     // #define wxUSE_GENERICDATAVIEWCTRL 1


@@ -96,7 +98,7 @@ WX_DEFINE_ARRAY(wxDataViewItem, wxDataViewItemArray);
 class WXDLLIMPEXP_ADV wxDataViewModelNotifier
 {
 public:
 class WXDLLIMPEXP_ADV wxDataViewModelNotifier
 {
 public:

-    wxDataViewModelNotifier() { }
+    wxDataViewModelNotifier() { m_owner = NULL; }

     virtual ~wxDataViewModelNotifier() { m_owner = NULL; }
 
     virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) = 0;
     virtual ~wxDataViewModelNotifier() { m_owner = NULL; }
 
     virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) = 0;


@@ -129,8 +131,8 @@ class WXDLLIMPEXP_ADV wxDataViewItemAttr
 {
 public:
     // ctors
 {
 public:
     // ctors

-    wxDataViewItemAttr() 
-    { 
+    wxDataViewItemAttr()
+    {

         m_bold = false;
         m_italic = false;
     }
         m_bold = false;
         m_italic = false;
     }


@@ -139,11 +141,11 @@ public:
     void SetColour(const wxColour& colour) { m_colour = colour; }
     void SetBold( bool set ) { m_bold = set; }
     void SetItalic( bool set ) { m_italic = set; }
     void SetColour(const wxColour& colour) { m_colour = colour; }
     void SetBold( bool set ) { m_bold = set; }
     void SetItalic( bool set ) { m_italic = set; }

-    
+

     // accessors
     bool HasColour() const { return m_colour.Ok(); }
     const wxColour& GetColour() const { return m_colour; }
     // accessors
     bool HasColour() const { return m_colour.Ok(); }
     const wxColour& GetColour() const { return m_colour; }

-    
+

     bool GetBold() const { return m_bold; }
     bool GetItalic() const { return m_italic; }
 
     bool GetBold() const { return m_bold; }
     bool GetItalic() const { return m_italic; }
 


@@ -191,6 +193,15 @@ public:
         { return false; }
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const = 0;
 
         { return false; }
     virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const = 0;
 

+    // define DnD capabilities
+    virtual bool IsDraggable( const wxDataViewItem &WXUNUSED(item) )
+        { return false; }
+    virtual size_t GetDragDataSize( const wxDataViewItem &WXUNUSED(item), const wxDataFormat &WXUNUSED(format) )
+        { return 0; }
+    virtual bool GetDragData( const wxDataViewItem &WXUNUSED(item), const wxDataFormat &WXUNUSED(format),
+                              void* WXUNUSED(data), size_t WXUNUSED(size) )
+        { return FALSE; }
+

     // delegated notifiers
     virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     virtual bool ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items );
     // delegated notifiers
     virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
     virtual bool ItemsAdded( const wxDataViewItem &parent, const wxDataViewItemArray &items );


@@ -211,7 +222,7 @@ public:
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
                          unsigned int column, bool ascending );
     virtual bool HasDefaultCompare() const { return false; }
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
                          unsigned int column, bool ascending );
     virtual bool HasDefaultCompare() const { return false; }

-    
+

     // internal
     virtual bool IsIndexListModel() const { return false; }
 
     // internal
     virtual bool IsIndexListModel() const { return false; }
 


@@ -240,13 +251,15 @@ public:
 
     virtual bool GetAttr( unsigned int WXUNUSED(row), unsigned int WXUNUSED(col), wxDataViewItemAttr &WXUNUSED(attr) )
         { return false; }
 
     virtual bool GetAttr( unsigned int WXUNUSED(row), unsigned int WXUNUSED(col), wxDataViewItemAttr &WXUNUSED(attr) )
         { return false; }

-        
+

     void RowPrepended();
     void RowInserted( unsigned int before );
     void RowAppended();
     void RowDeleted( unsigned int row );
     void RowPrepended();
     void RowInserted( unsigned int before );
     void RowAppended();
     void RowDeleted( unsigned int row );

+    void RowsDeleted( const wxArrayInt &rows );

     void RowChanged( unsigned int row );
     void RowValueChanged( unsigned int row, unsigned int col );
     void RowChanged( unsigned int row );
     void RowValueChanged( unsigned int row, unsigned int col );

+    void Reset( unsigned int new_size );

 
     // convert to/from row/wxDataViewItem
 
 
     // convert to/from row/wxDataViewItem
 


@@ -273,7 +286,7 @@ public:
     // internal
     virtual bool IsIndexListModel() const { return true; }
     unsigned int GetLastIndex() const { return m_lastIndex; }
     // internal
     virtual bool IsIndexListModel() const { return true; }
     unsigned int GetLastIndex() const { return m_lastIndex; }

-    
+

 private:
     wxDataViewItemArray m_hash;
     unsigned int m_lastIndex;
 private:
     wxDataViewItemArray m_hash;
     unsigned int m_lastIndex;


@@ -395,7 +408,8 @@ class WXDLLIMPEXP_ADV wxDataViewIconText: public wxObject
 {
 public:
     wxDataViewIconText( const wxString &text = wxEmptyString, const wxIcon& icon = wxNullIcon )
 {
 public:
     wxDataViewIconText( const wxString &text = wxEmptyString, const wxIcon& icon = wxNullIcon )

-    { m_icon = icon; m_text = text; }
+        : m_text(text), m_icon(icon)
+    { }

     wxDataViewIconText( const wxDataViewIconText &other )
     { m_icon = other.m_icon; m_text = other.m_text; }
 
     wxDataViewIconText( const wxDataViewIconText &other )
     { m_icon = other.m_icon; m_text = other.m_text; }
 


@@ -422,9 +436,10 @@ DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
 
 enum wxDataViewColumnFlags
 {
 
 enum wxDataViewColumnFlags
 {

-    wxDATAVIEW_COL_RESIZABLE  = 1,
-    wxDATAVIEW_COL_SORTABLE   = 2,
-    wxDATAVIEW_COL_HIDDEN     = 4
+    wxDATAVIEW_COL_RESIZABLE     = 1,
+    wxDATAVIEW_COL_SORTABLE      = 2,
+    wxDATAVIEW_COL_REORDERABLE   = 4,
+    wxDATAVIEW_COL_HIDDEN        = 8

 };
 
 class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject
 };
 
 class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject


@@ -445,6 +460,7 @@ public:
     virtual void SetTitle( const wxString &title ) = 0;
     virtual void SetAlignment( wxAlignment align ) = 0;
     virtual void SetSortable( bool sortable ) = 0;
     virtual void SetTitle( const wxString &title ) = 0;
     virtual void SetAlignment( wxAlignment align ) = 0;
     virtual void SetSortable( bool sortable ) = 0;

+    virtual void SetReorderable(bool reorderable) = 0;

     virtual void SetResizeable( bool resizeable ) = 0;
     virtual void SetHidden( bool hidden ) = 0;
     virtual void SetSortOrder( bool ascending ) = 0;
     virtual void SetResizeable( bool resizeable ) = 0;
     virtual void SetHidden( bool hidden ) = 0;
     virtual void SetSortOrder( bool ascending ) = 0;


@@ -467,9 +483,10 @@ public:
 
     virtual int GetFlags() const;
 
 
     virtual int GetFlags() const;
 

-    virtual bool IsSortable() const = 0;
-    virtual bool IsResizeable() const = 0;

     virtual bool IsHidden() const = 0;
     virtual bool IsHidden() const = 0;

+    virtual bool IsReorderable() const = 0;
+    virtual bool IsResizeable() const = 0;
+    virtual bool IsSortable() const = 0;

     virtual bool IsSortOrderAscending() const = 0;
 
     const wxBitmap &GetBitmap() const       { return m_bitmap; }
     virtual bool IsSortOrderAscending() const = 0;
 
     const wxBitmap &GetBitmap() const       { return m_bitmap; }


@@ -706,9 +723,9 @@ public:
     // for wxEVT_DATAVIEW_COLUMN_HEADER_CLICKED only
     void SetDataViewColumn( wxDataViewColumn *col ) { m_column = col; }
     wxDataViewColumn *GetDataViewColumn() const { return m_column; }
     // for wxEVT_DATAVIEW_COLUMN_HEADER_CLICKED only
     void SetDataViewColumn( wxDataViewColumn *col ) { m_column = col; }
     wxDataViewColumn *GetDataViewColumn() const { return m_column; }

-    
+

     // for wxEVT_DATAVIEW_CONTEXT_MENU only
     // for wxEVT_DATAVIEW_CONTEXT_MENU only

-    wxPoint GetPosition() const;
+    wxPoint GetPosition() const { return m_pos; }

     void SetPosition( int x, int y ) { m_pos.x = x; m_pos.y = y; }
 
     virtual wxEvent *Clone() const { return new wxDataViewEvent(*this); }
     void SetPosition( int x, int y ) { m_pos.x = x; m_pos.y = y; }
 
     virtual wxEvent *Clone() const { return new wxDataViewEvent(*this); }


@@ -725,24 +742,23 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent)
 };
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED, -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)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED, -1)
-    
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, -1)
-
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, -1)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED, -1)
-END_DECLARE_EVENT_TYPES()
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED;
+
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSED;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDED;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_COLLAPSING;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EXPANDING;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_STARTED;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_EDITING_DONE;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED;
+
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU;
+
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED;
+extern WXDLLIMPEXP_ADV const wxEventType wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED;

 
 typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 
 
 typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 


@@ -768,6 +784,7 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 #define EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_CLICK, id, fn)
 #define EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_RIGHT_CLICK, id, fn)
 #define EVT_DATAVIEW_COLUMN_SORTED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_SORTED, id, fn)
 #define EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_CLICK, id, fn)
 #define EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_HEADER_RIGHT_CLICK, id, fn)
 #define EVT_DATAVIEW_COLUMN_SORTED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_SORTED, id, fn)

+#define EVT_DATAVIEW_COLUMN_REORDERED(id, fn) wx__DECLARE_DATAVIEWEVT(COLUMN_REORDERED, id, fn)

 
 #if defined(wxUSE_GENERICDATAVIEWCTRL)
     #include "wx/generic/dataview.h"
 
 #if defined(wxUSE_GENERICDATAVIEWCTRL)
     #include "wx/generic/dataview.h"


@@ -968,7 +985,7 @@ public:
 
     void SetImageList( wxImageList *imagelist );
     wxImageList* GetImageList() { return m_imageList; }
 
     void SetImageList( wxImageList *imagelist );
     wxImageList* GetImageList() { return m_imageList; }

-    
+

     wxDataViewItem AppendItem( const wxDataViewItem& parent,
         const wxString &text, int icon = -1, wxClientData *data = NULL );
     wxDataViewItem PrependItem( const wxDataViewItem& parent,
     wxDataViewItem AppendItem( const wxDataViewItem& parent,
         const wxString &text, int icon = -1, wxClientData *data = NULL );
     wxDataViewItem PrependItem( const wxDataViewItem& parent,