GetLabel() added

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

diff --git a/include/wx/object.h b/include/wx/object.h
index b11e323e69276c5002fbad4195d5df1a87ad6aac..8da110ce980ad5448735c5efa2125c5b8297b9a6 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -13,7 +13,7 @@
 #define __OBJECTH__
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "object.h"
 #endif
 
 #include "wx/defs.h"
@@ -130,7 +130,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 #ifdef USE_STORABLE_CLASSES
 
 #define IMPLEMENT_STORABLE_CLASS(name, basename) \
-wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( fstream* stream, char* data )\
+wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( istream* stream, char* data )\
        { return new name( stream, data ); }\
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void)\
    { return new name; }\
@@ -138,7 +138,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void)\
    wxStorableConstructorFor##name );
 
 #define IMPLEMENT_STORABLE_CLASS2(name, basename1, basename2) \
-wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( fstream* stream, char* data )\
+wxObject* WXDLLEXPORT_CTORFN wxStorableConstructorFor##name( istream* stream, char* data )\
        { return new name( stream, data ); }\
 wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void)\
    { return new name; }\
@@ -206,7 +206,7 @@ class WXDLLEXPORT wxObject
 
   bool IsKindOf(wxClassInfo *info);
 
-#if DEBUG && USE_MEMORY_TRACING
+#if WXDEBUG && USE_MEMORY_TRACING
   void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete (void * buf);
   
@@ -218,7 +218,7 @@ class WXDLLEXPORT wxObject
 
 #endif
 
-#if DEBUG || USE_DEBUG_CONTEXT
+#if WXDEBUG || USE_DEBUG_CONTEXT
   virtual void Dump(ostream& str);
 #endif
 
@@ -256,7 +256,7 @@ private:
     int m_count;
 };
 
-#if DEBUG && USE_GLOBAL_MEMORY_OPERATORS
+#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS
 #ifndef WXDEBUG_NEW
 #define WXDEBUG_NEW new(__FILE__,__LINE__)
 #endif