removed wxUSE_IMAGE_LOADING_IN_MSW and wxUSE_RESOURCE_LOADING_IN_MSW settings, they...

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index dab00aeccac93b3b771d17ac4cc1810fb6f9bc40..a647fce87e4329339edf071eccb92dda60d779e1 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -6,13 +6,13 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMORYH__
 #define _WX_MEMORYH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMORYH__
 #define _WX_MEMORYH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "memory.h"
 #endif
 
 #pragma interface "memory.h"
 #endif
 


@@ -28,6 +28,8 @@
 
 #include <stddef.h>
 
 
 #include <stddef.h>
 

+// Obsolete
+#if 0

 #if wxUSE_IOSTREAMH
     // N.B. BC++ doesn't have istream.h, ostream.h
 #   include <iostream.h>
 #if wxUSE_IOSTREAMH
     // N.B. BC++ doesn't have istream.h, ostream.h
 #   include <iostream.h>


@@ -37,6 +39,7 @@
 //        using namespace std;
 #   endif
 #endif
 //        using namespace std;
 #   endif
 #endif

+#endif

 
 #ifdef __WXDEBUG__
 
 
 #ifdef __WXDEBUG__
 


@@ -112,8 +115,8 @@ inline void operator delete[] (void * buf)
 }
 #endif
 
 }
 #endif
 

-// VC++ 6.0
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+// VC++ 6.0 and MWERKS
+#if ( defined(__VISUALC__) && (__VISUALC__ >= 1200) ) || defined(__MWERKS__)

 inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {
   wxDebugFree(pData, FALSE);
 inline void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
 {
   wxDebugFree(pData, FALSE);


@@ -227,8 +230,11 @@ protected:
     // Traverse the list.
     static void TraverseList (PmSFV, wxMemStruct *from = NULL);
 
     // Traverse the list.
     static void TraverseList (PmSFV, wxMemStruct *from = NULL);
 

+    // Obsolete
+#if 0

     static wxSTD streambuf *m_streamBuf;
     static wxSTD ostream *m_debugStream;
     static wxSTD streambuf *m_streamBuf;
     static wxSTD ostream *m_debugStream;

+#endif

 
     static int debugLevel;
     static bool debugOn;
 
     static int debugLevel;
     static bool debugOn;


@@ -243,12 +249,15 @@ public:
     wxDebugContext(void);
     ~wxDebugContext(void);
 
     wxDebugContext(void);
     ~wxDebugContext(void);
 

+    // Obsolete
+#if 0

     static bool HasStream(void) { return (m_debugStream != NULL); };
     static wxSTD ostream& GetStream(void) { return *m_debugStream; }
     static wxSTD streambuf *GetStreamBuf(void) { return m_streamBuf; }
     static void SetStream(wxSTD ostream *stream, wxSTD streambuf *buf = NULL);
     static bool SetFile(const wxString& file);
     static bool SetStandardError(void);
     static bool HasStream(void) { return (m_debugStream != NULL); };
     static wxSTD ostream& GetStream(void) { return *m_debugStream; }
     static wxSTD streambuf *GetStreamBuf(void) { return m_streamBuf; }
     static void SetStream(wxSTD ostream *stream, wxSTD streambuf *buf = NULL);
     static bool SetFile(const wxString& file);
     static bool SetStandardError(void);

+#endif

 
     static int GetLevel(void) { return debugLevel; }
     static void SetLevel(int level) { debugLevel = level; }
 
     static int GetLevel(void) { return debugLevel; }
     static void SetLevel(int level) { debugLevel = level; }


@@ -321,8 +330,8 @@ private:
 };
 
 // Output a debug message, in a system dependent fashion.
 };
 
 // Output a debug message, in a system dependent fashion.

-void WXDLLEXPORT wxTrace(const wxChar *fmt ...);
-void WXDLLEXPORT wxTraceLevel(int level, const wxChar *fmt ...);
+void WXDLLEXPORT wxTrace(const wxChar *fmt ...) ATTRIBUTE_PRINTF_1;
+void WXDLLEXPORT wxTraceLevel(int level, const wxChar *fmt ...) ATTRIBUTE_PRINTF_2;

 
 #define WXTRACE wxTrace
 #define WXTRACELEVEL wxTraceLevel
 
 #define WXTRACE wxTrace
 #define WXTRACELEVEL wxTraceLevel