Add files necessary to run Expat configure.

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

diff --git a/interface/wx/weakref.h b/interface/wx/weakref.h
index 37130abb9ae94377e109e9b0a6bc2b317c34afc7..bf79582c7e15c2a40f709cff6b5aaf6f336aa2c9 100644 (file)
--- a/interface/wx/weakref.h
+++ b/interface/wx/weakref.h
@@ -3,13 +3,11 @@
 // Purpose:     interface of wxWeakRefDynamic<T>, wxWeakRef<T>
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxWeakRefDynamic<T>, wxWeakRef<T>
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 
 /**

-    @class wxWeakRefDynamic
-

     wxWeakRefDynamic<T> is a template class for weak references that is used in
     the same way as wxWeakRef<T>. The only difference is that wxWeakRefDynamic
     defaults to using @c dynamic_cast for establishing the object reference
     wxWeakRefDynamic<T> is a template class for weak references that is used in
     the same way as wxWeakRef<T>. The only difference is that wxWeakRefDynamic
     defaults to using @c dynamic_cast for establishing the object reference


@@ -20,7 +18,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).
 


@@ -29,10 +27,10 @@
     For API documentation, see: wxWeakRef<T>.
 
     @tparam T
     For API documentation, see: wxWeakRef<T>.
 
     @tparam T

-        @todo docme
+        The type to which the smart pointer points to.

 
     @nolibrary
 
     @nolibrary

-    @category{misc}
+    @category{smartpointers}

 */
 template<typename T>
 class wxWeakRefDynamic<T>
 */
 template<typename T>
 class wxWeakRefDynamic<T>


@@ -44,8 +42,6 @@ public:
 
 
 /**
 
 
 /**

-    @class wxWeakRef
-

     wxWeakRef<T> is a template class for weak references to wxWidgets objects,
     such as wxEvtHandler, wxWindow and wxObject.
     A weak reference behaves much like an ordinary pointer, but when the object
     wxWeakRef<T> is a template class for weak references to wxWidgets objects,
     such as wxEvtHandler, wxWindow and wxObject.
     A weak reference behaves much like an ordinary pointer, but when the object


@@ -95,10 +91,10 @@ public:
     @endcode
 
     @tparam T
     @endcode
 
     @tparam T

-        @todo docme
+        The type to which the smart pointer points to.

 
     @nolibrary
 
     @nolibrary

-    @category{misc}
+    @category{smartpointers}

 
     @see wxSharedPtr<T>, wxScopedPtr<T>
 */
 
     @see wxSharedPtr<T>, wxScopedPtr<T>
 */


@@ -106,6 +102,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.
     */


@@ -119,7 +118,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


@@ -157,11 +156,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.