#endif
#ifndef WX_PRECOMP
-#include "wx/hash.h"
-#ifdef USE_SERIAL
-#include "wx/objstrm.h"
-#include "wx/serbase.h"
-#endif
-#endif
+ #include "wx/hash.h"
+ #if wxUSE_SERIAL
+ #include "wx/objstrm.h"
+ #include "wx/serbase.h"
+
+ // for error messages
+ #include "wx/log.h"
+ #include "wx/intl.h"
+ #endif // wxUSE_SERIAL
+#endif // WX_PRECOMP
#include <string.h>
#include <assert.h>
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#include "wx/memory.h"
#endif
-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
// for wxObject::Dump
- #include <iostream.h>
+#if wxUSE_IOSTREAMH
+# include <iostream.h>
+#else
+# include <iostream>
+# ifdef _MSC_VER
+ using namespace std;
+# endif
+#endif
#endif
#if !USE_SHARED_LIBRARY
-wxClassInfo wxObject::classwxObject((char *) "wxObject", (char *) NULL, (char *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
-wxClassInfo *wxClassInfo::first = (wxClassInfo *) NULL;
-wxHashTable wxClassInfo::classTable(wxKEY_STRING);
+wxClassInfo wxObject::sm_classwxObject((char *) "wxObject", (char *) NULL, (char *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
+wxClassInfo* wxClassInfo::sm_first = (wxClassInfo *) NULL;
+wxHashTable* wxClassInfo::sm_classTable = (wxHashTable*) NULL;
#endif
/*
wxObject::wxObject(void)
{
m_refData = (wxObjectRefData *) NULL;
-#ifdef USE_SERIAL
+#if wxUSE_SERIAL
m_serialObj = (wxObject_Serialize *)NULL;
#endif
}
wxObject::~wxObject(void)
{
UnRef();
-#ifdef USE_SERIAL
+#if wxUSE_SERIAL
if (m_serialObj)
delete m_serialObj;
#endif
* two possible base classes.
*/
-bool wxObject::IsKindOf(wxClassInfo *info)
+bool wxObject::IsKindOf(wxClassInfo *info) const
{
wxClassInfo *thisInfo = GetClassInfo();
if (thisInfo)
return FALSE;
}
-#if WXDEBUG || USE_DEBUG_CONTEXT
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
void wxObject::Dump(ostream& str)
{
if (GetClassInfo() && GetClassInfo()->GetClassName())
}
#endif
-#if WXDEBUG && USE_MEMORY_TRACING
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
#ifdef new
#undef new
wxDebugFree(buf);
}
+// VC++ 6.0
+#if _MSC_VER >= 1200
+void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+{
+ ::operator delete(pData);
+}
+#endif
+
// Cause problems for VC++ - crashes
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && wxUSE_ARRAY_MEMORY_OPERATORS
void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)
{
return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);
wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn constr)
{
- className = cName;
- baseClassName1 = baseName1;
- baseClassName2 = baseName2;
+ m_className = cName;
+ m_baseClassName1 = baseName1;
+ m_baseClassName2 = baseName2;
- objectSize = sz;
- objectConstructor = constr;
+ m_objectSize = sz;
+ m_objectConstructor = constr;
- next = first;
- first = this;
+ m_next = sm_first;
+ sm_first = this;
- baseInfo1 = (wxClassInfo *) NULL;
- baseInfo2 = (wxClassInfo *) NULL;
+ m_baseInfo1 = (wxClassInfo *) NULL;
+ m_baseInfo2 = (wxClassInfo *) NULL;
}
wxObject *wxClassInfo::CreateObject(void)
{
- if (objectConstructor)
- return (wxObject *)(*objectConstructor)();
+ if (m_objectConstructor)
+ return (wxObject *)(*m_objectConstructor)();
else
return (wxObject *) NULL;
}
wxClassInfo *wxClassInfo::FindClass(char *c)
{
- wxClassInfo *p = first;
+ wxClassInfo *p = sm_first;
while (p)
{
if (p && p->GetClassName() && strcmp(p->GetClassName(), c) == 0)
return p;
- p = p->next;
+ p = p->m_next;
}
return (wxClassInfo *) NULL;
}
// Climb upwards through inheritance hierarchy.
// Dual inheritance is catered for.
-bool wxClassInfo::IsKindOf(wxClassInfo *info)
+bool wxClassInfo::IsKindOf(wxClassInfo *info) const
{
if (info == NULL)
return FALSE;
// For some reason, when making/using a DLL, static data has to be included
// in both the DLL and the application. This can lead to duplicate
// wxClassInfo objects, so we have to test the name instead of the pointers.
+ // PROBABLY NO LONGER TRUE now I've done DLL creation right.
+/*
#if WXMAKINGDLL
if (GetClassName() && info->GetClassName() && (strcmp(GetClassName(), info->GetClassName()) == 0))
return TRUE;
#else
+*/
if (this == info)
return TRUE;
-#endif
- if (baseInfo1)
- if (baseInfo1->IsKindOf(info))
+ if (m_baseInfo1)
+ if (m_baseInfo1->IsKindOf(info))
return TRUE;
- if (baseInfo2)
- return baseInfo2->IsKindOf(info);
+ if (m_baseInfo2)
+ return m_baseInfo2->IsKindOf(info);
return FALSE;
}
// Set pointers to base class(es) to speed up IsKindOf
void wxClassInfo::InitializeClasses(void)
{
+ wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING);
+
// Index all class infos by their class name
- wxClassInfo *info = first;
+ wxClassInfo *info = sm_first;
while (info)
{
- if (info->className)
- classTable.Put(info->className, (wxObject *)info);
- info = info->next;
+ if (info->m_className)
+ sm_classTable->Put(info->m_className, (wxObject *)info);
+ info = info->m_next;
}
// Set base pointers for each wxClassInfo
- info = first;
+ info = sm_first;
while (info)
{
if (info->GetBaseClassName1())
- info->baseInfo1 = (wxClassInfo *)classTable.Get(info->GetBaseClassName1());
+ info->m_baseInfo1 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName1());
if (info->GetBaseClassName2())
- info->baseInfo2 = (wxClassInfo *)classTable.Get(info->GetBaseClassName2());
- info = info->next;
+ info->m_baseInfo2 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName2());
+ info = info->m_next;
}
- first = NULL;
}
-wxObject *wxCreateDynamicObject(char *name)
+void wxClassInfo::CleanUpClasses(void)
{
- wxClassInfo *info;
+ delete wxClassInfo::sm_classTable;
+ wxClassInfo::sm_classTable = NULL;
+}
- info = (wxClassInfo *)wxClassInfo::classTable.Get(name);
- if (!info)
- return (wxObject *)NULL;
+wxObject *wxCreateDynamicObject(const char *name)
+{
+ if (wxClassInfo::sm_classTable)
+ {
+ wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);
+ if (!info)
+ return (wxObject *)NULL;
- return info->CreateObject();
+ return info->CreateObject();
+ }
+ else
+ {
+ wxClassInfo *info = wxClassInfo::sm_first;
+ while (info)
+ {
+ if (info->m_className && strcmp(info->m_className, name) == 0)
+ return info->CreateObject();
+ info = info->m_next;
+ }
+ return (wxObject*) NULL;
+ }
+ return (wxObject*) NULL;
}
-#ifdef USE_SERIAL
+#if wxUSE_SERIAL
#include "wx/serbase.h"
#include "wx/dynlib.h"
wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
if (!lib) {
- wxMessageBox("Can't load wxSerial dynamic library.", "Alert !");
+ wxLogError(_("Can't load wxSerial dynamic library."));
return;
}
if (!m_serialObj) {
m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
if (!m_serialObj) {
- wxString message;
-
- message.Printf("Can't find the serialization object (%s) for the object %s",
- WXSTRINGCAST obj_name,
- WXSTRINGCAST GetClassInfo()->GetClassName());
- wxMessageBox(message, "Alert !");
+ wxLogError(_("Can't find the serialization object '%s' "
+ "for the object '%s'."),
+ obj_name.c_str(),
+ GetClassInfo()->GetClassName());
return;
}
m_serialObj->SetObject(this);
m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
if (!m_serialObj) {
- wxString message;
-
- message.Printf("Can't find the serialization object (%s) for the object %s",
- WXSTRINGCAST obj_name,
- WXSTRINGCAST GetClassInfo()->GetClassName());
- wxMessageBox(message, "Alert !");
+ wxLogError(_("Can't find the serialization object '%s' "
+ "for the object '%s'."),
+ obj_name.c_str(),
+ GetClassInfo()->GetClassName());
return;
}
m_serialObj->SetObject(this);
{
}
+// These are here so we can avoid 'always true/false' warnings
+// by referring to these instead of TRUE/FALSE
+const bool wxTrue = TRUE;
+const bool wxFalse = FALSE;
projects / wxWidgets.git / blobdiff