Move code removing "-psn_xxx" command line arguments to common code.

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

diff --git a/interface/wx/weakref.h b/interface/wx/weakref.h
index 05a5503fd8893469f37bc055251db6f3fefd7f85..e954c26a3a90b11c761377e7f3000f43dfe26b9a 100644 (file)
--- a/interface/wx/weakref.h
+++ b/interface/wx/weakref.h
@@ -2,8 +2,7 @@
 // Name:        weakref.h
 // Purpose:     interface of wxWeakRefDynamic<T>, wxWeakRef<T>
 // Author:      wxWidgets team
 // Name:        weakref.h
 // Purpose:     interface of wxWeakRefDynamic<T>, wxWeakRef<T>
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -18,7 +17,7 @@
     is to handle objects which derived type one does not know.
 
     @note wxWeakRef<T> selects an implementation based on the static type of T.
     is to handle objects which derived type one does not know.
 
     @note wxWeakRef<T> selects an implementation based on the static type of T.

-          If T does not have wxTrackable statically, it defaults to to a mixed-
+          If T does not have wxTrackable statically, it defaults to a mixed-

           mode operation, where it uses @c dynamic_cast as the last measure
           (if available from the compiler and enabled when building wxWidgets).
 
           mode operation, where it uses @c dynamic_cast as the last measure
           (if available from the compiler and enabled when building wxWidgets).
 


@@ -102,6 +101,9 @@ template<typename T>
 class wxWeakRef<T> : public wxTrackerNode
 {
 public:
 class wxWeakRef<T> : public wxTrackerNode
 {
 public:

+    /// Type of the element stored by this reference.
+    typedef T element_type;
+

     /**
         Constructor. The weak reference is initialized to @e pobj.
     */
     /**
         Constructor. The weak reference is initialized to @e pobj.
     */


@@ -115,7 +117,7 @@ public:
     /**
         Destructor.
     */
     /**
         Destructor.
     */

-    ~wxWeakRef();
+    virtual ~wxWeakRef();

 
     /**
         Called when the tracked object is destroyed. Be default sets
 
     /**
         Called when the tracked object is destroyed. Be default sets


@@ -153,11 +155,10 @@ public:
     T& operator*() const;
 
     /**
     T& operator*() const;
 
     /**

-        Smart pointer member access.
-        Returns a pointer to the tracked object.
+        Smart pointer member access. Returns a pointer to the tracked object.

         If the internal pointer is @NULL this method will cause an assert in debug mode.
     */
         If the internal pointer is @NULL this method will cause an assert in debug mode.
     */

-    T* operator-();
+    T* operator->();

 
     /**
         Releases the currently tracked object and starts tracking @e pobj.
 
     /**
         Releases the currently tracked object and starts tracking @e pobj.