Revert back to standard point size for fonts in OS/2

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

diff --git a/src/common/object.cpp b/src/common/object.cpp
index ab59919f01fe8e3d3cd44e9eaedce9eda43afeeb..86b84c8a4370cf79d26e2f740fc90192a834068a 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -2,10 +2,11 @@
 // Name:        object.cpp
 // Purpose:     wxObject implementation
 // Author:      Julian Smart
 // Name:        object.cpp
 // Purpose:     wxObject implementation
 // Author:      Julian Smart

-// Modified by:
+// Modified by: Ron Lee

 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Julian Smart and Markus Holzem
+//              (c) 2001 Ron Lee <ron@debian.org>

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -13,7 +14,8 @@
 #pragma implementation "object.h"
 #endif
 
 #pragma implementation "object.h"
 #endif
 

-// For compilers that support precompilation, includes "wx.h".
+    // For compilers that support precompilation, includes "wx.h".
+

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -21,16 +23,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #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 "wx/hash.h"
+#endif

 
 #include <string.h>
 #include <assert.h>
 
 #include <string.h>
 #include <assert.h>


@@ -41,68 +35,43 @@
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
     // for wxObject::Dump
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
     // for wxObject::Dump

-    #include "wx/ioswrap.h"
+#include "wx/ioswrap.h"
+
+#if defined(__VISAGECPP__)
+#define DEBUG_PRINTF(NAME) { static int raz=0; \
+ printf( #NAME " %i\n",raz); fflush(stdout); raz++; }
+#else
+#define DEBUG_PRINTF(NAME)

 #endif
 
 #endif
 

-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

 
 

-/*
- * wxWindows root object.
- */
+ 
+wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0,
+                                        (int) sizeof(wxObject),
+                                        (wxObjectConstructorFn) 0 );
+wxClassInfo* wxClassInfo::sm_first = 0;
+wxHashTable* wxClassInfo::sm_classTable = 0;

 
 

-wxObject::wxObject()
-{
-    m_refData = (wxObjectRefData *) NULL;
-#if wxUSE_SERIAL
-    m_serialObj = (wxObject_Serialize *)NULL;
-#endif
-}
+    // These are here so we can avoid 'always true/false' warnings
+    // by referring to these instead of TRUE/FALSE

 
 

-wxObject::~wxObject()
-{
-    UnRef();
-#if wxUSE_SERIAL
-    if (m_serialObj)
-        delete m_serialObj;
-#endif
-}
+const bool wxTrue = TRUE;
+const bool wxFalse = FALSE;

 
 

-/*
- * Is this object a kind of (a subclass of) 'info'?
- * E.g. is wxWindow a kind of wxObject?
- * Go from this class to superclass, taking into account
- * two possible base classes.
- */
+    // Is this object a kind of (a subclass of) 'info'?
+    // E.g. is wxWindow a kind of wxObject?
+    // Go from this class to superclass, taking into account
+    // two possible base classes.

 
 bool wxObject::IsKindOf(wxClassInfo *info) const
 {
     wxClassInfo *thisInfo = GetClassInfo();
 
 bool wxObject::IsKindOf(wxClassInfo *info) const
 {
     wxClassInfo *thisInfo = GetClassInfo();

-    if (thisInfo)
-        return thisInfo->IsKindOf(info);
-    else
-        return FALSE;
-}
-
-wxObject *wxObject::Clone() const
-{
-    wxObject *object = GetClassInfo()->CreateObject();
-    CopyObject(*object);
-    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()));
+    return (thisInfo) ? thisInfo->IsKindOf(info) : FALSE ;

 }
 
 #if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
 }
 
 #if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)

-void wxObject::Dump(ostream& str)
+void wxObject::Dump(wxSTD ostream& str)

 {
     if (GetClassInfo() && GetClassInfo()->GetClassName())
         str << GetClassInfo()->GetClassName();
 {
     if (GetClassInfo() && GetClassInfo()->GetClassName())
         str << GetClassInfo()->GetClassName();


@@ -117,110 +86,73 @@ void wxObject::Dump(ostream& str)
 #undef new
 #endif
 
 #undef new
 #endif
 

-void *wxObject::operator new (size_t size, wxChar * fileName, int lineNum)
+void *wxObject::operator new (size_t size, wxChar *fileName, int lineNum)

 {
     return wxDebugAlloc(size, fileName, lineNum, TRUE);
 }
 
 {
     return wxDebugAlloc(size, fileName, lineNum, TRUE);
 }
 

-void wxObject::operator delete (void * buf)
+#ifndef __VISAGECPP__
+void wxObject::operator delete (void *buf)
+{
+    wxDebugFree(buf);
+}
+#elif __DEBUG_ALLOC__
+void wxObject::operator delete (void *buf, const char *_fname, size_t _line)

 {
     wxDebugFree(buf);
 }
 {
     wxDebugFree(buf);
 }

+#endif
+
+    // VC++ 6.0

 
 

-// VC++ 6.0

 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)

-void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+void wxObject::operator delete(void *pData, wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum))

 {
     ::operator delete(pData);
 }
 #endif
 
 {
     ::operator delete(pData);
 }
 #endif
 

-// Cause problems for VC++ - crashes
+    // Cause problems for VC++ - crashes
+

 #if (!defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS ) || defined(__MWERKS__)
 #if (!defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS ) || defined(__MWERKS__)

-void * wxObject::operator new[] (size_t size, wxChar * fileName, int lineNum)
+void *wxObject::operator new[] (size_t size, wxChar *fileName, int lineNum)

 {
     return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);
 }
 
 {
     return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);
 }
 

-void wxObject::operator delete[] (void * buf)
+void wxObject::operator delete[] (void *buf)

 {
     wxDebugFree(buf, TRUE);
 }
 #endif
 
 {
     wxDebugFree(buf, TRUE);
 }
 #endif
 

-#endif
-
-/*
- * Class info: provides run-time class type information.
- */
-
-wxClassInfo::wxClassInfo(wxChar *cName, wxChar *baseName1, wxChar *baseName2, int sz, wxObjectConstructorFn constr)
-{
-    m_className = cName;
-    m_baseClassName1 = baseName1;
-    m_baseClassName2 = baseName2;
-
-    m_objectSize = sz;
-    m_objectConstructor = constr;
+#endif  // __WXDEBUG__  && wxUSE_MEMORY_TRACING

 
 

-    m_next = sm_first;
-    sm_first = this;

 
 

-    m_baseInfo1 = (wxClassInfo *) NULL;
-    m_baseInfo2 = (wxClassInfo *) NULL;
-}
+// ----------------------------------------------------------------------------
+// wxClassInfo
+// ----------------------------------------------------------------------------

 
 

-wxObject *wxClassInfo::CreateObject()
+wxClassInfo *wxClassInfo::FindClass(const wxChar *className)

 {
 {

-    if (m_objectConstructor)
-        return (wxObject *)(*m_objectConstructor)();
+    if ( sm_classTable )
+    {
+        return (wxClassInfo *)wxClassInfo::sm_classTable->Get(className);
+    }

     else
     else

-        return (wxObject *) NULL;
-}
-
-wxClassInfo *wxClassInfo::FindClass(wxChar *c)
-{
-    wxClassInfo *p = sm_first;
-    while (p)

     {
     {

-        if (p && p->GetClassName() && wxStrcmp(p->GetClassName(), c) == 0)
-            return p;
-        p = p->m_next;
+        for ( wxClassInfo *info = sm_first; info ; info = info->m_next )
+        {
+            if ( wxStrcmp(info->GetClassName(), className) == 0 )
+                return info;
+        }
+
+        return NULL;

     }
     }

-    return (wxClassInfo *) NULL;

 }
 
 }
 

-// Climb upwards through inheritance hierarchy.
-// Dual inheritance is catered for.
-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() && (wxStrcmp(GetClassName(), info->GetClassName()) == 0))
-return TRUE;
-#else
-     */
-    if (this == info)
-        return TRUE;
-
-    if (m_baseInfo1)
-        if (m_baseInfo1->IsKindOf(info))
-            return TRUE;
-
-    if (m_baseInfo2)
-        return m_baseInfo2->IsKindOf(info);
-
-    return FALSE;
-}
+    // Set pointers to base class(es) to speed up IsKindOf

 
 

-// Set pointers to base class(es) to speed up IsKindOf

 void wxClassInfo::InitializeClasses()
 {
     // using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you
 void wxClassInfo::InitializeClasses()
 {
     // using IMPLEMENT_DYNAMIC_CLASS() macro twice (which may happen if you


@@ -228,141 +160,82 @@ void wxClassInfo::InitializeClasses()
     // 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
     // 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

+

 #ifdef __WXDEBUG__
 #ifdef __WXDEBUG__

-    // more classes than we'll ever have
-    static const size_t nMaxClasses = 10000;
+    static const size_t nMaxClasses = 10000;    // more than we'll ever have

     size_t nClass = 0;
     size_t nClass = 0;

-#endif // Debug
+#endif

 
     wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING);
 
 
     wxClassInfo::sm_classTable = new wxHashTable(wxKEY_STRING);
 

-    // Index all class infos by their class name
-    wxClassInfo *info = sm_first;
-    while (info)
+        // Index all class infos by their class name
+
+    wxClassInfo *info;
+    for(info = sm_first; info; info = info->m_next)

     {
         if (info->m_className)
         {
             wxASSERT_MSG( ++nClass < nMaxClasses,
     {
         if (info->m_className)
         {
             wxASSERT_MSG( ++nClass < nMaxClasses,

-                          _T("an infinite loop detected - have you used "
-                            "IMPLEMENT_DYNAMIC_CLASS() twice (may be by "
-                            "linking some object module(s) twice)?") );
-
+                          _T("an infinite loop detected - have you used IMPLEMENT_DYNAMIC_CLASS() twice (may be by linking some object module(s) twice)?") );

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

-
-        info = info->m_next;

     }
 
     }
 

-    // Set base pointers for each wxClassInfo
-    info = sm_first;
-    while (info)
+        // Set base pointers for each wxClassInfo
+
+    for(info = sm_first; info; info = info->m_next)

     {
         if (info->GetBaseClassName1())
             info->m_baseInfo1 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName1());
         if (info->GetBaseClassName2())
             info->m_baseInfo2 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName2());
     {
         if (info->GetBaseClassName1())
             info->m_baseInfo1 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName1());
         if (info->GetBaseClassName2())
             info->m_baseInfo2 = (wxClassInfo *)sm_classTable->Get(info->GetBaseClassName2());

-        info = info->m_next;

     }
 }
 
 void wxClassInfo::CleanUpClasses()
 {
     delete wxClassInfo::sm_classTable;
     }
 }
 
 void wxClassInfo::CleanUpClasses()
 {
     delete wxClassInfo::sm_classTable;

-    wxClassInfo::sm_classTable = NULL;
+    wxClassInfo::sm_classTable = 0;

 }
 
 }
 

+

 wxObject *wxCreateDynamicObject(const wxChar *name)
 {
 wxObject *wxCreateDynamicObject(const wxChar *name)
 {

+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+ DEBUG_PRINTF(wxObject *wxCreateDynamicObject)
+#endif
+

     if (wxClassInfo::sm_classTable)
     {
         wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);
     if (wxClassInfo::sm_classTable)
     {
         wxClassInfo *info = (wxClassInfo *)wxClassInfo::sm_classTable->Get(name);

-        if (!info)
-            return (wxObject *)NULL;
-
-        return info->CreateObject();
+        return info != 0 ? info->CreateObject() : 0;

     }
     else
     {
     }
     else
     {

-        wxClassInfo *info = wxClassInfo::sm_first;
-        while (info)
-        {
+        for(wxClassInfo *info = wxClassInfo::sm_first; info; info = info->m_next)

             if (info->m_className && wxStrcmp(info->m_className, name) == 0)
                 return info->CreateObject();
             if (info->m_className && wxStrcmp(info->m_className, name) == 0)
                 return info->CreateObject();

-            info = info->m_next;
-        }
-        return (wxObject*) NULL;
-    }
-}
-
-#if wxUSE_SERIAL
-
-#include "wx/serbase.h"
-#include "wx/dynlib.h"
-
-wxObject* wxCreateStoredObject( wxInputStream &stream )
-{
-    wxObjectInputStream obj_s(stream);
-    return obj_s.LoadObject();
-};
-
-void wxObject::StoreObject( wxObjectOutputStream& stream )
-{
-    wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
-    wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
-
-    if (!lib) {
-        wxLogError(_("Can't load wxSerial dynamic library."));
-        return;
+        return 0;

     }
     }

-    if (!m_serialObj) {
-        m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
-
-        if (!m_serialObj) {
-            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->StoreObject(stream);
-}
-
-void wxObject::LoadObject( wxObjectInputStream& stream )
-{
-    wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
-    wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
-
-    if (!m_serialObj) {
-        m_serialObj = (WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
-
-        if (!m_serialObj) {
-            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->LoadObject(stream);

 }
 
 }
 

-#endif // wxUSE_SERIAL

 
 

-/*
- * wxObject: cloning of objects
- */
+// ----------------------------------------------------------------------------
+// wxClassInfo
+// ----------------------------------------------------------------------------

 
 void wxObject::Ref(const wxObject& clone)
 {
 
 void wxObject::Ref(const wxObject& clone)
 {

+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+ DEBUG_PRINTF(wxObject::Ref)
+#endif
+

     // delete reference to old data
     UnRef();
     // delete reference to old data
     UnRef();

+

     // reference new data
     // reference new data

-    if (clone.m_refData) {
+    if( clone.m_refData )
+    {

         m_refData = clone.m_refData;
         ++(m_refData->m_count);
     }
         m_refData = clone.m_refData;
         ++(m_refData->m_count);
     }


@@ -370,29 +243,38 @@ void wxObject::Ref(const wxObject& clone)
 
 void wxObject::UnRef()
 {
 
 void wxObject::UnRef()
 {

-    if ( m_refData )
+    if( m_refData )

     {
         wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
 
         if ( !--m_refData->m_count )
             delete m_refData;
     {
         wxASSERT_MSG( m_refData->m_count > 0, _T("invalid ref data count") );
 
         if ( !--m_refData->m_count )
             delete m_refData;

-        m_refData = (wxObjectRefData *) NULL;
+        m_refData = 0;

     }
 }
 
     }
 }
 

-/*
- * wxObjectData
- */

 
 

-wxObjectRefData::wxObjectRefData(void) : m_count(1)
-{
-}
+#if defined(__DARWIN__) && defined(DYLIB_INIT)
+
+extern "C" {
+    void __initialize_Cplusplus(void);
+    void wxWindowsDylibInit(void);
+};

 
 

-wxObjectRefData::~wxObjectRefData()
+    // Dynamic shared library (dylib) initialization routine
+    //   required to initialize static C++ objects bacause of lazy dynamic linking
+    //   http://developer.apple.com/techpubs/macosx/Essentials/
+    //          SystemOverview/Frameworks/Dynamic_Shared_Libraries.html
+
+void wxWindowsDylibInit()

 {
 {

+    // The function __initialize_Cplusplus() must be called from the shared
+    // library initialization routine to cause the static C++ objects in
+    // the library to be initialized (reference number 2441683).
+
+    __initialize_Cplusplus();

 }
 
 }
 

-// 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;
+#endif
+
+// vi:sts=4:sw=4:et