Silence warning about truncation since the comment says it ok

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 605eb33b43c91f309463374f07abf4fa56dd7487..f43f2b2d99c0beb17026d0017b35a5fb277cc8c3 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -10,10 +10,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "object.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -81,14 +77,22 @@ wxClassInfo wxObject::ms_classInfo( wxT("wxObject"), 0, 0,
 wxClassInfo* wxClassInfo::sm_first = NULL;
 wxHashTable* wxClassInfo::sm_classTable = NULL;
 
 wxClassInfo* wxClassInfo::sm_first = NULL;
 wxHashTable* wxClassInfo::sm_classTable = NULL;
 

+// when using XTI, this method is already implemented inline inside
+// DECLARE_DYNAMIC_CLASS but otherwise we intentionally make this function
+// non-inline because this allows us to have a non-inline virtual function in
+// all wx classes and this solves linking problems for HP-UX native toolchain
+// and possibly others (we could make dtor non-inline as well but it's more
+// useful to keep it inline than this function)
+#if !wxUSE_EXTENDED_RTTI
+

 wxClassInfo *wxObject::GetClassInfo() const
 {
     return &wxObject::ms_classInfo;
 }
 
 wxClassInfo *wxObject::GetClassInfo() const
 {
     return &wxObject::ms_classInfo;
 }
 

-// These are here so we can avoid 'always true/false' warnings
-// by referring to these instead of true/false
-const bool wxTrue = true;
+#endif // wxUSE_EXTENDED_RTTI
+
+// this variable exists only so that we can avoid 'always true/false' warnings

 const bool wxFalse = false;
 
 // Is this object a kind of (a subclass of) 'info'?
 const bool wxFalse = false;
 
 // Is this object a kind of (a subclass of) 'info'?


@@ -220,13 +224,18 @@ void wxClassInfo::Register()
         sm_classTable = new wxHashTable(wxKEY_STRING);
     }
 
         sm_classTable = new wxHashTable(wxKEY_STRING);
     }
 

-    // using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
-    // link any object module twice mistakenly) will break this function
-    // because it will enter an infinite loop and eventually die with "out of
-    // memory" - as this is quite hard to detect if you're unaware of this,
-    // try to do some checks here
+    // Using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
+    // link any object module twice mistakenly, or link twice against wx shared
+    // library) will break this function because it will enter an infinite loop
+    // and eventually die with "out of memory" - as this is quite hard to
+    // detect if you're unaware of this, try to do some checks here.

     wxASSERT_MSG( sm_classTable->Get(m_className) == NULL,
     wxASSERT_MSG( sm_classTable->Get(m_className) == NULL,

-                  _T("class already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() twice (may be by linking some object module(s) twice)?") );
+        wxString::Format
+        (
+            _T("Class \"%s\" already in RTTI table - have you used IMPLEMENT_DYNAMIC_CLASS() multiple times or linked some object file twice)?"),
+            m_className
+        )
+    );

 
     sm_classTable->Put(m_className, (wxObject *)this);
 }
 
     sm_classTable->Put(m_className, (wxObject *)this);
 }