added (and documented) trivial but useful IsSingleLine() and IsMultiLine() text contr...

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index e676282b7a072573981535c54386ffbb4dcac421..eebfc3890c14c3ea4af8ef0dccc25bf1a1c8bb06 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -115,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);


@@ -330,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