fixing warning and compile error against 10.4

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 23b34bf3341a28a9eca3545a6e8b64cb7eab4408..5c14734fdd78646455b28bdfe037086f2f097451 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -131,7 +131,7 @@ public:
     }
 
     wxDECLARE_CLASS_INFO_ITERATORS();
     }
 
     wxDECLARE_CLASS_INFO_ITERATORS();

-    
+

 private:
     const wxChar            *m_className;
     int                      m_objectSize;
 private:
     const wxChar            *m_className;
     int                      m_objectSize;


@@ -233,7 +233,7 @@ WXDLLIMPEXP_BASE wxObject *wxCreateDynamicObject(const wxString& name);
 
 #define wxIMPLEMENT_CLASS(name, basename)                                     \
     wxIMPLEMENT_ABSTRACT_CLASS(name, basename)
 
 #define wxIMPLEMENT_CLASS(name, basename)                                     \
     wxIMPLEMENT_ABSTRACT_CLASS(name, basename)

-    
+

 #define wxIMPLEMENT_CLASS2(name, basename1, basename2)                        \
     IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)
 
 #define wxIMPLEMENT_CLASS2(name, basename1, basename2)                        \
     IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2)
 


@@ -422,6 +422,12 @@ protected:
 private:
     // our refcount:
     int m_count;
 private:
     // our refcount:
     int m_count;

+
+    // It doesn't make sense to copy the reference counted objects, a new ref
+    // counter should be created for a new object instead and compilation
+    // errors in the code using wxRefCounter due to the lack of copy ctor often
+    // indicate a problem, e.g. a forgotten copy ctor implementation somewhere.
+    wxDECLARE_NO_COPY_CLASS(wxRefCounter);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------