1. added wxTreeCtrl::SetItemBold and IsBold, updated the sample to show them

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

diff --git a/include/wx/object.h b/include/wx/object.h
index b5af8484bbd9acbb186dbf899669384bfcb44281..2791952dcb5a6aa7370017362ce1a23eda69a073 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -37,7 +37,8 @@ class WXDLLEXPORT wxHashTable;
 class WXDLLEXPORT wxObject_Serialize;
 
 #if wxUSE_IOSTREAMH
-#  include <ostream.h>
+// N.B. BC++ doesn't have istream.h, ostream.h
+#  include <iostream.h>
 #else
 #  include <ostream>
 #  ifdef _MSC_VER
@@ -95,10 +96,10 @@ public:
    static wxHashTable*      sm_classTable;
 };
 
-wxObject* WXDLLEXPORT wxCreateDynamicObject(const char *name);
+WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
 
 #ifdef wxUSE_SERIAL
-wxObject* WXDLLEXPORT wxCreateStoredObject( wxInputStream& stream );
+WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #endif
 
 #define DECLARE_DYNAMIC_CLASS(name) \
@@ -186,7 +187,7 @@ class WXDLLEXPORT wxObject
 
   bool IsKindOf(wxClassInfo *info) const;
 
-#if WXDEBUG && wxUSE_MEMORY_TRACING
+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);
   
@@ -203,7 +204,7 @@ class WXDLLEXPORT wxObject
 
 #endif
 
-#if WXDEBUG || wxUSE_DEBUG_CONTEXT
+#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
   virtual void Dump(ostream& str);
 #endif
 
@@ -245,10 +246,19 @@ private:
     int m_count;
 };
 
-#if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
-//#ifndef WXDEBUG_NEW
-//#define WXDEBUG_NEW new(__FILE__,__LINE__)
-//#endif
+#ifdef __WXDEBUG__
+#ifndef WXDEBUG_NEW
+#define WXDEBUG_NEW new(__FILE__,__LINE__)
+#endif
+#else
+#define WXDEBUG_NEW new
+#endif
+
+// Redefine new to be the debugging version. This doesn't
+// work with all compilers, in which case you need to
+// 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__)
 #endif