document column reordering in wxListCtrl; fix confusion between GetColumnOrder()...

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

diff --git a/include/wx/weakref.h b/include/wx/weakref.h
index 74b590d6278daff5c4c07298d373030b677301f2..e0bd1f90dd9286522d928c2607a1177f733d594f 100644 (file)
--- a/include/wx/weakref.h
+++ b/include/wx/weakref.h
@@ -59,6 +59,13 @@ public:
         }
     }
 
+    virtual void OnObjectDestroy()
+    {
+        // Tracked object itself removes us from list of trackers
+        wxASSERT(m_pobj != NULL);
+        m_pobj = NULL;
+    }
+
 protected:
     void Assign(T* pobj)
     {
@@ -82,13 +89,6 @@ protected:
         Assign( wr.m_pobj );
     }
 
-    virtual void OnObjectDestroy()
-    {
-        // Tracked object itself removes us from list of trackers
-        wxASSERT( m_pobj!=NULL );
-        m_pobj = NULL;
-    }
-
     T *m_pobj;
 };
 
@@ -122,6 +122,14 @@ struct wxWeakRefImpl<T, false> : public wxTrackerNode
         }
     }
 
+    virtual void OnObjectDestroy()
+    {
+        // Tracked object itself removes us from list of trackers
+        wxASSERT(m_pobj != NULL);
+        m_pobj = NULL;
+        m_ptbase = NULL;
+    }
+
 protected:
     wxWeakRefImpl() : m_pobj(NULL), m_ptbase(NULL) { }
 
@@ -177,14 +185,6 @@ protected:
         }
     }
 
-    virtual void OnObjectDestroy()
-    {
-        // Tracked object itself removes us from list of trackers
-        wxASSERT( m_pobj!=NULL );
-        m_pobj = NULL;
-        m_ptbase = NULL;
-    }
-
     T *m_pobj;
     wxTrackable *m_ptbase;
 };
@@ -293,6 +293,13 @@ public:
         }
     }
 
+    virtual void OnObjectDestroy()
+    {
+        wxASSERT_MSG(m_pobj, "tracked object should have removed us itself");
+
+        m_pobj = NULL;
+    }
+
 protected:
     void Assign(T *pobj)
     {
@@ -320,13 +327,6 @@ protected:
         }
     }
 
-    virtual void OnObjectDestroy()
-    {
-        wxASSERT_MSG( m_pobj, "tracked object should have removed us itself" );
-
-        m_pobj = NULL;
-    }
-
     T *m_pobj;
 };