take const wxConfig object in wxDocManager::FileHistoryLoad() and wxFileHistory:...

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index c2db8eef481b92cdb03a362f16c24ddabfe1b502..ee31afec70377c07e6b032a8b4dbb38cf4f237ec 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -23,6 +23,7 @@
 #include "wx/dynarray.h"
 #include "wx/icon.h"
 #include "wx/imaglist.h"
 #include "wx/dynarray.h"
 #include "wx/icon.h"
 #include "wx/imaglist.h"

+#include "wx/weakref.h"

 
 class WXDLLIMPEXP_FWD_CORE wxDataFormat;
 
 
 class WXDLLIMPEXP_FWD_CORE wxDataFormat;
 


@@ -292,7 +293,6 @@ private:
     wxDataViewItemArray m_hash;
     unsigned int m_lastIndex;
     bool m_ordered;
     wxDataViewItemArray m_hash;
     unsigned int m_lastIndex;
     bool m_ordered;

-    bool m_useHash;

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


@@ -413,6 +413,7 @@ public:
     wxDataViewRendererBase( const wxString &varianttype,
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );
     wxDataViewRendererBase( const wxString &varianttype,
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );

+    ~wxDataViewRendererBase();

 
     virtual bool Validate( wxVariant& WXUNUSED(value) )
         { return true; }
 
     virtual bool Validate( wxVariant& WXUNUSED(value) )
         { return true; }


@@ -456,7 +457,7 @@ public:
 protected:
     wxString                m_variantType;
     wxDataViewColumn       *m_owner;
 protected:
     wxString                m_variantType;
     wxDataViewColumn       *m_owner;

-    wxControl              *m_editorCtrl;
+    wxWeakRef<wxControl>    m_editorCtrl;

     wxDataViewItem          m_item; // for m_editorCtrl
 
     // internal utility:
     wxDataViewItem          m_item; // for m_editorCtrl
 
     // internal utility: