another GetInt/GetId bug fix

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 2791952dcb5a6aa7370017362ce1a23eda69a073..3ce6e27bc3db60692cc41048b41490f85c5bafbb 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OBJECTH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OBJECTH__


@@ -23,27 +23,25 @@ class WXDLLEXPORT wxObject;
 
 #if wxUSE_DYNAMIC_CLASSES
 
 
 #if wxUSE_DYNAMIC_CLASSES
 

-#ifdef __GNUWIN32__
+// #ifdef __GNUWIN32__

 #ifdef GetClassName
 #undef GetClassName
 #endif
 #ifdef GetClassName
 #undef GetClassName
 #endif

+#ifdef GetClassInfo
+#undef GetClassInfo

 #endif
 #endif

+// #endif

 
 class WXDLLEXPORT wxClassInfo;
 class WXDLLEXPORT wxInputStream;
 
 class WXDLLEXPORT wxClassInfo;
 class WXDLLEXPORT wxInputStream;

+class WXDLLEXPORT wxOutputStream;

 class WXDLLEXPORT wxObjectInputStream;
 class WXDLLEXPORT wxObjectOutputStream;
 class WXDLLEXPORT wxHashTable;
 class WXDLLEXPORT wxObject_Serialize;
 
 class WXDLLEXPORT wxObjectInputStream;
 class WXDLLEXPORT wxObjectOutputStream;
 class WXDLLEXPORT wxHashTable;
 class WXDLLEXPORT wxObject_Serialize;
 

-#if wxUSE_IOSTREAMH
-// N.B. BC++ doesn't have istream.h, ostream.h
-#  include <iostream.h>
-#else
-#  include <ostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)
+  #include "wx/ioswrap.h"

 #endif
 
 /*
 #endif
 
 /*


@@ -55,13 +53,13 @@ typedef wxObject * (*wxObjectConstructorFn) (void);
 class WXDLLEXPORT wxClassInfo
 {
  public:
 class WXDLLEXPORT wxClassInfo
 {
  public:

-   wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn);
+   wxClassInfo(wxChar *cName, wxChar *baseName1, wxChar *baseName2, int sz, wxObjectConstructorFn fn);

 
    wxObject *CreateObject(void);
 
    wxObject *CreateObject(void);

-   
-   inline char *GetClassName(void) const { return m_className; }
-   inline char *GetBaseClassName1(void) const { return m_baseClassName1; }
-   inline char *GetBaseClassName2(void) const { return m_baseClassName2; }
+
+   inline wxChar *GetClassName(void) const { return m_className; }
+   inline wxChar *GetBaseClassName1(void) const { return m_baseClassName1; }
+   inline wxChar *GetBaseClassName2(void) const { return m_baseClassName2; }

    inline wxClassInfo* GetBaseClass1() const { return m_baseInfo1; }
    inline wxClassInfo* GetBaseClass2() const { return m_baseInfo2; }
    inline int GetSize(void) const { return m_objectSize; }
    inline wxClassInfo* GetBaseClass1() const { return m_baseInfo1; }
    inline wxClassInfo* GetBaseClass2() const { return m_baseInfo2; }
    inline int GetSize(void) const { return m_objectSize; }


@@ -70,7 +68,7 @@ class WXDLLEXPORT wxClassInfo
    inline wxClassInfo* GetNext() const { return m_next; }
    bool IsKindOf(wxClassInfo *info) const;
 
    inline wxClassInfo* GetNext() const { return m_next; }
    bool IsKindOf(wxClassInfo *info) const;
 

-   static wxClassInfo *FindClass(char *c);
+   static wxClassInfo *FindClass(wxChar *c);

 
    // Initializes parent pointers and hash table for fast searching.
    static void InitializeClasses(void);
 
    // Initializes parent pointers and hash table for fast searching.
    static void InitializeClasses(void);


@@ -79,12 +77,12 @@ class WXDLLEXPORT wxClassInfo
    static void CleanUpClasses(void);
 
 public:
    static void CleanUpClasses(void);
 
 public:

-   char*                    m_className;
-   char*                    m_baseClassName1;
-   char*                    m_baseClassName2;
+   wxChar*                  m_className;
+   wxChar*                  m_baseClassName1;
+   wxChar*                  m_baseClassName2;

    int                      m_objectSize;
    wxObjectConstructorFn    m_objectConstructor;
    int                      m_objectSize;
    wxObjectConstructorFn    m_objectConstructor;

-   
+

    // Pointers to base wxClassInfos: set in InitializeClasses
    // called from wx_main.cc
    wxClassInfo*             m_baseInfo1;
    // Pointers to base wxClassInfos: set in InitializeClasses
    // called from wx_main.cc
    wxClassInfo*             m_baseInfo1;


@@ -96,9 +94,9 @@ public:
    static wxHashTable*      sm_classTable;
 };
 
    static wxHashTable*      sm_classTable;
 };
 

-WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
+WXDLLEXPORT wxObject* wxCreateDynamicObject(const wxChar *name);

 
 

-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL

 WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #endif
 
 WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #endif
 


@@ -119,13 +117,13 @@ WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename) \
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
    { return new name; }\
 #define IMPLEMENT_DYNAMIC_CLASS(name, basename) \
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
    { return new name; }\

- wxClassInfo name::sm_class##name((char *) #name, (char *) #basename, (char *) NULL, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);
+ wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename), (wxChar *) NULL, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);

 
 // Multiple inheritance with two base classes
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
    { return new name; }\
 
 // Multiple inheritance with two base classes
 #define IMPLEMENT_DYNAMIC_CLASS2(name, basename1, basename2) \
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
    { return new name; }\

- wxClassInfo name::sm_class##name((char *) #name, (char *) #basename1, (char *) #basename2, (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);
+ wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename1), (wxChar *) wxT(#basename2), (int) sizeof(name), (wxObjectConstructorFn) wxConstructorFor##name);

 
 //////
 ////// for abstract classes
 
 //////
 ////// for abstract classes


@@ -133,19 +131,20 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 // Single inheritance with one base class
 #define IMPLEMENT_ABSTRACT_CLASS(name, basename) \
 
 // Single inheritance with one base class
 #define IMPLEMENT_ABSTRACT_CLASS(name, basename) \

- wxClassInfo name::sm_class##name((char *) #name, (char *) #basename, \
-                (char *) NULL, (int) sizeof(name), (wxObjectConstructorFn) NULL);
+ wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename), \
+         (wxChar *) NULL, (int) sizeof(name), (wxObjectConstructorFn) NULL);

 
 // Multiple inheritance with two base classes
 #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \
 
 // Multiple inheritance with two base classes
 #define IMPLEMENT_ABSTRACT_CLASS2(name, basename1, basename2) \

- wxClassInfo name::sm_class##name((char *) #name, (char *) #basename1, (char *) #basename2, (int) sizeof(name), (wxObjectConstructorFn) NULL);
+ wxClassInfo name::sm_class##name((wxChar *) wxT(#name), (wxChar *) wxT(#basename1), \
+         (wxChar *) wxT(#basename2), (int) sizeof(name), (wxObjectConstructorFn) NULL);

 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
 #define CLASSINFO(name) (&name::sm_class##name)
 
 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
 #define CLASSINFO(name) (&name::sm_class##name)
 

-#else
+#else // !wxUSE_DYNAMIC_CLASSES

 
 // No dynamic class system: so stub out the macros
 #define DECLARE_DYNAMIC_CLASS(name)
 
 // No dynamic class system: so stub out the macros
 #define DECLARE_DYNAMIC_CLASS(name)


@@ -158,17 +157,41 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 
 #define IMPLEMENT_CLASS IMPLEMENT_ABSTRACT_CLASS
 #define IMPLEMENT_CLASS2 IMPLEMENT_ABSTRACT_CLASS2
 

-#endif
+#endif // wxUSE_DYNAMIC_CLASSES/!wxUSE_DYNAMIC_CLASSES

 
 

-#define IS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)
+#define wxIS_KIND_OF(obj, className) obj->IsKindOf(&className::sm_class##className)
+
+// Just seems a bit nicer-looking (pretend it's not a macro)
+#define wxIsKindOf(obj, className) obj->IsKindOf(&className::sm_class##className)
+
+// to be replaced by dynamic_cast<> in the future
+#define wxDynamicCast(obj, className) \
+        ((obj) && ((obj)->IsKindOf(&className::sm_class##className)) \
+        ? (className *)(obj) \
+        : (className *)0)
+
+#define wxConstCast(obj, className) ((className *)(obj))
+
+#ifdef __WXDEBUG__
+    inline void wxCheckCast(void *ptr)
+    {
+        wxASSERT_MSG( ptr, _T("wxStaticCast() used incorrectly") );
+    }
+
+    #define wxStaticCast(obj, className) \
+        (wxCheckCast(wxDynamicCast(obj, className)), ((className *)(obj)))
+
+#else // !Debug
+    #define wxStaticCast(obj, className) ((className *)(obj))
+#endif // Debug/!Debug

 
 // Unfortunately Borland seems to need this include.
 #ifdef __BORLANDC__
 
 // Unfortunately Borland seems to need this include.
 #ifdef __BORLANDC__

-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
+    #if wxUSE_IOSTREAMH
+        #include <iostream.h>
+    #else
+        #include <iostream>
+    #endif

 #endif
 
 class WXDLLEXPORT wxObjectRefData;
 #endif
 
 class WXDLLEXPORT wxObjectRefData;


@@ -184,31 +207,39 @@ class WXDLLEXPORT wxObject
   virtual ~wxObject(void);
 
   virtual wxClassInfo *GetClassInfo(void) const { return &sm_classwxObject; }
   virtual ~wxObject(void);
 
   virtual wxClassInfo *GetClassInfo(void) const { return &sm_classwxObject; }

+  wxObject *Clone(void) const;
+  virtual void CopyObject(wxObject& object_dest) const;

 
   bool IsKindOf(wxClassInfo *info) const;
 
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
 
   bool IsKindOf(wxClassInfo *info) const;
 
 #if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING

-  void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
+  void * operator new (size_t size, wxChar * fileName = NULL, int lineNum = 0);

   void operator delete (void * buf);
   void operator delete (void * buf);

-  
+

 // VC++ 6.0
 // VC++ 6.0

-#if _MSC_VER >= 1200
-  void operator delete(void *buf, char*, int);
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+  void operator delete(void *buf, wxChar*, int);

 #endif
 
 #endif
 

-  // Cause problems for VC++
-#ifndef _MSC_VER
-  void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
+    // Causes problems for VC++
+#if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__)
+  void * operator new[] (size_t size, wxChar * fileName = NULL, int lineNum = 0);

   void operator delete[] (void * buf);
 #endif
 
   void operator delete[] (void * buf);
 #endif
 

+#ifdef __MWERKS__
+  void * operator new[] (size_t size, wxChar * fileName , int lineNum = 0);
+  void * operator new[] (size_t size) { return operator new[] ( size , NULL , 0 ) ; }
+  void operator delete[] (void * buf);

 #endif
 
 #endif
 

-#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
+#endif // Debug & memory tracing
+
+#if wxUSE_STD_IOSTREAM && (defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT)

   virtual void Dump(ostream& str);
 #endif
 
   virtual void Dump(ostream& str);
 #endif
 

-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL

   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif
   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif


@@ -224,7 +255,7 @@ class WXDLLEXPORT wxObject
 
 protected:
   wxObjectRefData*      m_refData;
 
 protected:
   wxObjectRefData*      m_refData;

-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL

   wxObject_Serialize*   m_serialObj;
 #endif
 };
   wxObject_Serialize*   m_serialObj;
 #endif
 };


@@ -248,7 +279,7 @@ private:
 
 #ifdef __WXDEBUG__
 #ifndef WXDEBUG_NEW
 
 #ifdef __WXDEBUG__
 #ifndef WXDEBUG_NEW

-#define WXDEBUG_NEW new(__FILE__,__LINE__)
+#define WXDEBUG_NEW new(__TFILE__,__LINE__)

 #endif
 #else
 #define WXDEBUG_NEW new
 #endif
 #else
 #define WXDEBUG_NEW new


@@ -259,7 +290,7 @@ private:
 // use WXDEBUG_NEW explicitly if you wish to use the debugging version.
 
 #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
 // use WXDEBUG_NEW explicitly if you wish to use the debugging version.
 
 #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS

-#define new new(__FILE__,__LINE__)
+#define new new(__TFILE__,__LINE__)

 #endif
 
 #endif
 #endif
 
 #endif