Fix wxGenericListCtrl best size calculation in report view.

[wxWidgets.git] / src / common / memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 71658b74dbde4d43a3cf13c8591223a134c6b09c..7480718c9bb3edd2af2b49d8994acf111236602a 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -21,7 +21,7 @@
 #include "wx/memory.h"
 
 #ifndef WX_PRECOMP
 #include "wx/memory.h"
 
 #ifndef WX_PRECOMP

-    #ifdef __WXMSW__
+    #ifdef __WINDOWS__

         #include "wx/msw/wrapwin.h"
     #endif
     #include "wx/utils.h"
         #include "wx/msw/wrapwin.h"
     #endif
     #include "wx/utils.h"


@@ -38,8 +38,7 @@
 
 #include "wx/ioswrap.h"
 
 
 #include "wx/ioswrap.h"
 

-#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
-     && !defined( __MWERKS__ )
+#if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )

 #include <memory.h>
 #endif
 
 #include <memory.h>
 #endif
 


@@ -118,8 +117,9 @@ void wxMemStruct::ErrorMsg ()
 */
 int wxMemStruct::AssertList ()
 {
 */
 int wxMemStruct::AssertList ()
 {

-    if (wxDebugContext::GetHead () != 0 && ! (wxDebugContext::GetHead ())->AssertIt () ||
-        wxDebugContext::GetTail () != 0 && ! wxDebugContext::GetTail ()->AssertIt ()) {
+    if ((wxDebugContext::GetHead() && !wxDebugContext::GetHead()->AssertIt()) ||
+        (wxDebugContext::GetTail() && !wxDebugContext::GetTail()->AssertIt()))
+    {

         ErrorMsg ("Head or tail pointers trashed");
         return 0;
     }
         ErrorMsg ("Head or tail pointers trashed");
         return 0;
     }


@@ -831,16 +831,16 @@ void wxDebugContext::OutputDumpLine(const wxChar *szFormat, ...)
     int count;
     va_list argptr;
     va_start(argptr, szFormat);
     int count;
     va_list argptr;
     va_start(argptr, szFormat);

-    buf[WXSIZEOF(buf)-1] = _T('\0');
+    buf[WXSIZEOF(buf)-1] = wxT('\0');

 
     // keep 3 bytes for a \r\n\0
     count = wxVsnprintf(buf, WXSIZEOF(buf)-3, szFormat, argptr);
 
     if ( count < 0 )
         count = WXSIZEOF(buf)-3;
 
     // keep 3 bytes for a \r\n\0
     count = wxVsnprintf(buf, WXSIZEOF(buf)-3, szFormat, argptr);
 
     if ( count < 0 )
         count = WXSIZEOF(buf)-3;

-    buf[count]=_T('\r');
-    buf[count+1]=_T('\n');
-    buf[count+2]=_T('\0');
+    buf[count]=wxT('\r');
+    buf[count+1]=wxT('\n');
+    buf[count+2]=wxT('\0');

 
     wxMessageOutputDebug dbgout;
     dbgout.Printf(buf);
 
     wxMessageOutputDebug dbgout;
     dbgout.Printf(buf);


@@ -887,7 +887,7 @@ static MemoryCriticalSection memLocker;
 #endif // USE_THREADSAFE_MEMORY_ALLOCATION
 
 
 #endif // USE_THREADSAFE_MEMORY_ALLOCATION
 
 

-#if !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#if !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))

 #if wxUSE_GLOBAL_MEMORY_OPERATORS
 void * operator new (size_t size, wxChar * fileName, int lineNum)
 {
 #if wxUSE_GLOBAL_MEMORY_OPERATORS
 void * operator new (size_t size, wxChar * fileName, int lineNum)
 {


@@ -921,7 +921,7 @@ void operator delete[] (void * buf)
 }
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 #endif // wxUSE_GLOBAL_MEMORY_OPERATORS
 }
 #endif // wxUSE_ARRAY_MEMORY_OPERATORS
 #endif // wxUSE_GLOBAL_MEMORY_OPERATORS

-#endif // !(defined(__WXMSW__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))
+#endif // !(defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL_BASE)))

 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
 
 // TODO: store whether this is a vector or not.
 void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )


@@ -1044,7 +1044,7 @@ void wxTrace(const wxChar * ...)
 
   va_start(ap, fmt);
 
 
   va_start(ap, fmt);
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

   wvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;
   wvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;


@@ -1058,7 +1058,7 @@ void wxTrace(const wxChar * ...)
     wxDebugContext::GetStream().flush();
   }
   else
     wxDebugContext::GetStream().flush();
   }
   else

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else
 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else


@@ -1084,7 +1084,7 @@ void wxTraceLevel(int, const wxChar * ...)
 
   va_start(ap, fmt);
 
 
   va_start(ap, fmt);
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

   wxWvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;
   wxWvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;


@@ -1098,7 +1098,7 @@ void wxTraceLevel(int, const wxChar * ...)
     wxDebugContext::GetStream().flush();
   }
   else
     wxDebugContext::GetStream().flush();
   }
   else

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else
 #ifdef __WIN32__
     OutputDebugString((LPCTSTR)buffer) ;
 #else