Regenerated makefiles

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 46cb8ae57f0bb3ec61e4cb94fb828951f34533f0..ec832adb839c6d69cdf2403e768b262b52bd4676 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -81,10 +81,38 @@ private:
 
 bool operator == (const wxDataViewItem &left, const wxDataViewItem &right);
 
 
 bool operator == (const wxDataViewItem &left, const wxDataViewItem &right);
 

+// ---------------------------------------------------------
+// wxDataViewModelNotifier
+// ---------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxDataViewModelNotifier
+{
+public:
+    wxDataViewModelNotifier() { }
+    virtual ~wxDataViewModelNotifier() { m_owner = NULL; }
+
+    virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) = 0;
+    virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) = 0;
+    virtual bool ItemChanged( const wxDataViewItem &item ) = 0;
+    virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col ) = 0;
+    virtual bool Cleared() = 0;
+    
+    virtual void Resort() = 0;
+
+    void SetOwner( wxDataViewModel *owner ) { m_owner = owner; }
+    wxDataViewModel *GetOwner()             { return m_owner; }
+
+private:
+    wxDataViewModel *m_owner;
+};
+
+

 // ---------------------------------------------------------
 // wxDataViewModel
 // ---------------------------------------------------------
 
 // ---------------------------------------------------------
 // wxDataViewModel
 // ---------------------------------------------------------
 

+WX_DECLARE_LIST(wxDataViewModelNotifier, wxDataViewModelNotifiers );
+

 class WXDLLIMPEXP_ADV wxDataViewModel: public wxObjectRefData
 {
 public:
 class WXDLLIMPEXP_ADV wxDataViewModel: public wxObjectRefData
 {
 public:


@@ -135,9 +163,9 @@ protected:
     // the user should not delete this class directly: he should use DecRef() instead!
     virtual ~wxDataViewModel() { }
 
     // the user should not delete this class directly: he should use DecRef() instead!
     virtual ~wxDataViewModel() { }
 

-    wxList                  m_notifiers;
-    unsigned int            m_sortingColumn;
-    bool                    m_ascending;
+    wxDataViewModelNotifiers  m_notifiers;
+    unsigned int              m_sortingColumn;
+    bool                      m_ascending;

 };
 
 // ---------------------------------------------------------
 };
 
 // ---------------------------------------------------------


@@ -193,32 +221,6 @@ private:
     unsigned int m_lastIndex;
 };
 
     unsigned int m_lastIndex;
 };
 

-// ---------------------------------------------------------
-// wxDataViewModelNotifier
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewModelNotifier: public wxObject
-{
-public:
-    wxDataViewModelNotifier() { }
-    virtual ~wxDataViewModelNotifier() { m_owner = NULL; }
-
-    virtual bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) = 0;
-    virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) = 0;
-    virtual bool ItemChanged( const wxDataViewItem &item ) = 0;
-    virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col ) = 0;
-    virtual bool Cleared() = 0;
-    
-    virtual void Resort() { };
-
-    void SetOwner( wxDataViewModel *owner ) { m_owner = owner; }
-    wxDataViewModel *GetOwner()             { return m_owner; }
-
-private:
-    wxDataViewModel *m_owner;
-};
-
-

 //-----------------------------------------------------------------------------
 // wxDataViewEditorCtrlEvtHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDataViewEditorCtrlEvtHandler
 //-----------------------------------------------------------------------------