some conflicts resolved

[wxWidgets.git] / src / common / object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index d2d37670fa9933c426adf8ed526b482b12cb5439..0672600cf98e741c88fbafce2b1c3db102d43222 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -45,7 +45,7 @@
 #endif
 
 #if !USE_SHARED_LIBRARY
-wxClassInfo wxObject::sm_classwxObject((wxChar *) T("wxObject"), (wxChar *) NULL, (wxChar *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
+wxClassInfo wxObject::sm_classwxObject((wxChar *) wxT("wxObject"), (wxChar *) NULL, (wxChar *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
 wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
 wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
 #endif
@@ -94,7 +94,11 @@ wxObject *wxObject::Clone() const
     return object;
 }
 
+#ifdef __WXDEBUG__
 void wxObject::CopyObject(wxObject& object_dest) const
+#else // !Debug
+void wxObject::CopyObject(wxObject& WXUNUSED(object_dest)) const
+#endif // Debug/!Debug
 {
     wxASSERT(object_dest.GetClassInfo()->IsKindOf(GetClassInfo()));
 }