For non-Unicode added #include <ctype.h> and <string.h> to avoid some missing

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

diff --git a/include/wx/object.h b/include/wx/object.h
index b16265669a6797c85f538cd204d81f36dcf76355..a335a1dfcc3e9fa40aec34e14069b882b18f47ca 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__


@@ -34,19 +34,20 @@ class WXDLLEXPORT wxObject;
 
 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;
 
 #if wxUSE_IOSTREAMH
 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>
+    // N.B. BC++ doesn't have istream.h, ostream.h
+#   include <iostream.h>

 #else
 #else

-#  include <ostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#   include <ostream>
+#   if defined(__VISUALC__) || defined(__MWERKS__)
+        using namespace std;
+#   endif

 #endif
 
 /*
 #endif
 
 /*


@@ -61,7 +62,7 @@ class WXDLLEXPORT wxClassInfo
    wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn);
 
    wxObject *CreateObject(void);
    wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn);
 
    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 char *GetClassName(void) const { return m_className; }
    inline char *GetBaseClassName1(void) const { return m_baseClassName1; }
    inline char *GetBaseClassName2(void) const { return m_baseClassName2; }


@@ -87,7 +88,7 @@ public:
    char*                    m_baseClassName2;
    int                      m_objectSize;
    wxObjectConstructorFn    m_objectConstructor;
    char*                    m_baseClassName2;
    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;


@@ -101,7 +102,7 @@ public:
 
 WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
 
 
 WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
 

-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL

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


@@ -198,31 +199,28 @@ class WXDLLEXPORT wxObject
   void operator delete (void * buf);
 
 // VC++ 6.0
   void operator delete (void * buf);
 
 // VC++ 6.0

-#if _MSC_VER >= 1200
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)

   void operator delete(void *buf, char*, int);
 #endif
 
   void operator delete(void *buf, char*, int);
 #endif
 

-  // Cause problems for VC++
-// #ifndef _MSC_VER
-#if !defined(_MSC_VER) && wxUSE_ARRAY_MEMORY_OPERATORS
+    // Causes problems for VC++
+#if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__) && !defined( __MWERKS__)

   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete[] (void * buf);
 #endif
 
   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete[] (void * buf);
 #endif
 

-/*

 #ifdef __MWERKS__
   void * operator new[] (size_t size, char * fileName  , int lineNum = 0);
   void operator delete[] (void * buf);
 #endif
 #ifdef __MWERKS__
   void * operator new[] (size_t size, char * fileName  , int lineNum = 0);
   void operator delete[] (void * buf);
 #endif

-*/

 
 

-#endif
+#endif // Debug & memory tracing

 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
   virtual void Dump(ostream& str);
 #endif
 
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
   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


@@ -238,7 +236,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
 };