further prototype revisions; rename interface/aui.h to interface/framemanager.h since...

[wxWidgets.git] / interface / object.h

diff --git a/interface/object.h b/interface/object.h
index bc9e0663db9800293b2dacfe6926073a6da01f94..35507bc200162194764d72ca1dc57fb7a4fa1913 100644 (file)
--- a/interface/object.h
+++ b/interface/object.h
@@ -33,7 +33,7 @@ public:
         never
         be destroyed directly but only as result of a DecRef() call.
     */
-    wxObjectRefData();
+    ~wxObjectRefData();
 
     /**
         Decrements the reference count associated with this shared data and, if it
@@ -107,10 +107,10 @@ public:
         memory states.
         This function is only defined in debug build and doesn't exist at all if
         @c __WXDEBUG__ is not defined.
-        
+
         @param stream
             Stream on which to output dump information.
-        
+
         @remarks Currently wxWidgets does not define Dump for derived classes,
                  but programmers may wish to use it for their own
                  applications. Be sure to call the Dump member of the
@@ -127,7 +127,7 @@ public:
 
     /**
         Returns the @b m_refData pointer.
-        
+
         @see Ref(), UnRef(), wxObject::m_refData, SetRefData(),
              wxObjectRefData
     */
@@ -136,11 +136,11 @@ public:
     /**
         Determines whether this class is a subclass of (or the same class as)
         the given class.
-        
+
         @param info
             A pointer to a class information object, which may be obtained
             by using the CLASSINFO macro.
-        
+
         @returns @true if the class represented by info is the same class as this
                  one or is derived from it.
     */
@@ -156,14 +156,14 @@ public:
 
     /**
         Makes this object refer to the data in @e clone.
-        
+
         @param clone
             The object to 'clone'.
-        
+
         @remarks First this function calls UnRef() on itself to decrement
                  (and perhaps free) the data it is currently referring
                  to.
-        
+
         @see UnRef(), wxObject::m_refData, SetRefData(),
              GetRefData(), wxObjectRefData
     */
@@ -171,7 +171,7 @@ public:
 
     /**
         Sets the @b m_refData pointer.
-        
+
         @see Ref(), UnRef(), wxObject::m_refData, GetRefData(),
              wxObjectRefData
     */
@@ -181,7 +181,7 @@ public:
         Decrements the reference count in the associated data, and if it is zero,
         deletes the data.
         The @b m_refData member is set to @NULL.
-        
+
         @see Ref(), wxObject::m_refData, SetRefData(),
              GetRefData(), wxObjectRefData
     */
@@ -198,7 +198,7 @@ public:
     /**
         wxObjectRefData*  m_refData
         Pointer to an object which is the object's reference-counted data.
-        
+
         @see Ref(), UnRef(), SetRefData(),
              GetRefData(), wxObjectRefData
     */
@@ -302,7 +302,6 @@ public:
 
 
 /**
-    @class wxObjectDataPtrT
     @wxheader{object.h}
 
     This is helper template class primarily written to avoid memory
@@ -449,7 +448,7 @@ public:
     };
     @endcode
 */
-#define DECLARE_DYNAMIC_CLASS( name )
+#define DECLARE_DYNAMIC_CLASS( className )
 
 /**
     Used in a C++ implementation file to complete the declaration of a class
@@ -575,7 +574,7 @@ public:
 
     @see wx_const_cast(), wxDynamicCast(), wxStaticCast()
 */
-#define wxConstCast( object, className )
+#define wxConstCast( ptr, classname )
 
 /**
     This is defined in debug mode to be call the redefined new operator
@@ -619,7 +618,7 @@ public:
     @see @ref overview_runtimeclassoverview "RTTI Overview",
          wxDynamicCastThis(), wxConstCast(), wxStaticCast()
 */
-#define wxDynamicCast( object, className )
+#define wxDynamicCast( ptr, classname )
 
 /**
     This macro is equivalent to wxDynamicCast() but the latter provokes
@@ -631,7 +630,7 @@ public:
 
     @see wxDynamicCast()
 */
-#define wxDynamicCastThis( className )
+#define wxDynamicCastThis( classname )
 
 /**
     This macro checks that the cast is valid in debug mode (an assert failure
@@ -642,7 +641,7 @@ public:
 
     @see wx_static_cast(), wxDynamicCast(), wxConstCast()
 */
-#define wxStaticCast( object, className )
+#define wxStaticCast( ptr, classname )
 
 /**
     Creates and returns an object of the given class, if the class has been
@@ -651,7 +650,7 @@ public:
 
     @header{wx/object.h}
 */
-wxObject *wxCreateDynamicObject(const wxString& name);
+wxObject *wxCreateDynamicObject(const wxString& className);
 
 //@}