X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a38aced4ecb7c9ca602e66b2defb8c2a1307d52..b09857ae000a60704207d63290be937584805fb0:/interface/wx/object.h

diff --git a/interface/wx/object.h b/interface/wx/object.h
index 787e5f7a13..90d6655767 100644
--- a/interface/wx/object.h
+++ b/interface/wx/object.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxRefCounter
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /** @class wxObjectRefData
@@ -42,7 +42,7 @@
         virtual wxObjectRefData *CreateRefData() const;
         virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
-        DECLARE_DYNAMIC_CLASS(MyCar)
+        wxDECLARE_DYNAMIC_CLASS(MyCar)
     };
 
 
@@ -83,7 +83,7 @@
 
 
     #define M_CARDATA ((MyCarRefData *)m_refData)
-    IMPLEMENT_DYNAMIC_CLASS(MyCar,wxObject)
+    wxIMPLEMENT_DYNAMIC_CLASS(MyCar, wxObject);
 
     MyCar::MyCar( int price )
     {
@@ -257,12 +257,12 @@ public:
 
     /**
         This virtual function is redefined for every class that requires run-time
-        type information, when using the ::DECLARE_CLASS macro (or similar).
+        type information, when using the ::wxDECLARE_CLASS macro (or similar).
     */
     virtual wxClassInfo* GetClassInfo() const;
 
     /**
-        Returns the wxObject::m_refData pointer, i.e. the data referenced by this object.
+        Returns the wxObject::m_refData pointer, i.e.\ the data referenced by this object.
 
         @see Ref(), UnRef(), wxObject::m_refData, SetRefData(), wxObjectRefData
     */
@@ -275,12 +275,12 @@ public:
         Example:
 
         @code
-        bool tmp = obj->IsKindOf(CLASSINFO(wxFrame));
+        bool tmp = obj->IsKindOf(wxCLASSINFO(wxFrame));
         @endcode
 
         @param info
             A pointer to a class information object, which may be obtained
-            by using the ::CLASSINFO macro.
+            by using the ::wxCLASSINFO macro.
 
         @return @true if the class represented by info is the same class as this
                  one or is derived from it.
@@ -412,8 +412,8 @@ protected:
     This class stores meta-information about classes.
 
     Instances of this class are not generally defined directly by an application,
-    but indirectly through use of macros such as ::DECLARE_DYNAMIC_CLASS and
-    ::IMPLEMENT_DYNAMIC_CLASS.
+    but indirectly through use of macros such as ::wxDECLARE_DYNAMIC_CLASS and
+    ::wxIMPLEMENT_DYNAMIC_CLASS.
 
     @library{wxbase}
     @category{rtti}
@@ -655,21 +655,12 @@ public:
 
     @header{wx/object.h}
 */
-#define CLASSINFO( className )
-
-/**
-    Used inside a class declaration to declare that the class should be made
-    known to the class hierarchy, but objects of this class cannot be created
-    dynamically. The same as DECLARE_ABSTRACT_CLASS().
-
-    @header{wx/object.h}
-*/
-#define DECLARE_CLASS( className )
+#define wxCLASSINFO( className )
 
 /**
     Used inside a class declaration to declare that the class should be
     made known to the class hierarchy, but objects of this class cannot be created
-    dynamically. The same as DECLARE_CLASS().
+    dynamically.
 
     @header{wx/object.h}
 
@@ -678,7 +669,7 @@ public:
     @code
     class wxCommand: public wxObject
     {
-        DECLARE_ABSTRACT_CLASS(wxCommand)
+        wxDECLARE_ABSTRACT_CLASS(wxCommand);
 
     private:
         ...
@@ -687,14 +678,14 @@ public:
     };
     @endcode
 */
-#define DECLARE_ABSTRACT_CLASS( className )
+#define wxDECLARE_ABSTRACT_CLASS( className )
 
 /**
     Used inside a class declaration to make the class known to wxWidgets RTTI
     system and also declare that the objects of this class should be
     dynamically creatable from run-time type information. Notice that this
     implies that the class should have a default constructor, if this is not
-    the case consider using DECLARE_CLASS().
+    the case consider using wxDECLARE_ABSTRACT_CLASS().
 
     @header{wx/object.h}
 
@@ -703,7 +694,7 @@ public:
     @code
     class wxFrame: public wxWindow
     {
-    DECLARE_DYNAMIC_CLASS(wxFrame)
+        wxDECLARE_DYNAMIC_CLASS(wxFrame);
 
     private:
         const wxString& frameTitle;
@@ -712,35 +703,29 @@ public:
     };
     @endcode
 */
-#define DECLARE_DYNAMIC_CLASS( className )
+#define wxDECLARE_DYNAMIC_CLASS( className )
 
 /**
-    Used in a C++ implementation file to complete the declaration of a class
-    that has run-time type information. The same as IMPLEMENT_ABSTRACT_CLASS().
+    Used inside a class declaration to declare that the class should be made
+    known to the class hierarchy, but objects of this class cannot be created
+    dynamically.
 
-    @header{wx/object.h}
-*/
-#define IMPLEMENT_CLASS( className, baseClassName )
-
-/**
-    Used in a C++ implementation file to complete the declaration of a class
-    that has run-time type information and two base classes. The same as
-    IMPLEMENT_ABSTRACT_CLASS2().
+    The same as wxDECLARE_ABSTRACT_CLASS().
 
     @header{wx/object.h}
 */
-#define IMPLEMENT_CLASS2( className, baseClassName1, baseClassName2 )
+#define wxDECLARE_CLASS( className )
 
 /**
     Used in a C++ implementation file to complete the declaration of a class
-    that has run-time type information. The same as IMPLEMENT_CLASS().
-
+    that has run-time type information.
+    
     @header{wx/object.h}
 
     Example:
 
     @code
-    IMPLEMENT_ABSTRACT_CLASS(wxCommand, wxObject)
+    wxIMPLEMENT_ABSTRACT_CLASS(wxCommand, wxObject);
 
     wxCommand::wxCommand(void)
     {
@@ -748,16 +733,15 @@ public:
     }
     @endcode
 */
-#define IMPLEMENT_ABSTRACT_CLASS( className, baseClassName )
+#define wxIMPLEMENT_ABSTRACT_CLASS( className, baseClassName )
 
 /**
     Used in a C++ implementation file to complete the declaration of a class
-    that has run-time type information and two base classes. The same as
-    IMPLEMENT_CLASS2().
+    that has run-time type information and two base classes. 
 
     @header{wx/object.h}
 */
-#define IMPLEMENT_ABSTRACT_CLASS2( className, baseClassName1, baseClassName2 )
+#define wxIMPLEMENT_ABSTRACT_CLASS2( className, baseClassName1, baseClassName2 )
 
 /**
     Used in a C++ implementation file to complete the declaration of a class
@@ -769,7 +753,7 @@ public:
     Example:
 
     @code
-    IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+    wxIMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow);
 
     wxFrame::wxFrame(void)
     {
@@ -777,7 +761,7 @@ public:
     }
     @endcode
 */
-#define IMPLEMENT_DYNAMIC_CLASS( className, baseClassName )
+#define wxIMPLEMENT_DYNAMIC_CLASS( className, baseClassName )
 
 /**
     Used in a C++ implementation file to complete the declaration of a class
@@ -786,7 +770,25 @@ public:
 
     @header{wx/object.h}
 */
-#define IMPLEMENT_DYNAMIC_CLASS2( className, baseClassName1, baseClassName2 )
+#define wxIMPLEMENT_DYNAMIC_CLASS2( className, baseClassName1, baseClassName2 )
+
+/**
+    Used in a C++ implementation file to complete the declaration of a class
+    that has run-time type information, and whose instances can be created
+    dynamically. The same as wxIMPLEMENT_DYNAMIC_CLASS().
+
+    @header{wx/object.h}
+*/
+#define wxIMPLEMENT_CLASS( className, baseClassName )
+
+/**
+    Used in a C++ implementation file to complete the declaration of a class
+    that has run-time type information and two base classes, and whose instances 
+    can be created dynamically. The same as wxIMPLEMENT_DYNAMIC_CLASS2().
+
+    @header{wx/object.h}
+*/
+#define wxIMPLEMENT_CLASS2( className, baseClassName1, baseClassName2 )
 
 /**
     Same as @c const_cast<T>(x) if the compiler supports const cast or @c (T)x for