Modified CaptureMouse to call DoReleaseMouse if necessary before

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 24ef330d3923b347e7bb9eaae55c9bcc039c6479..df54d3664c57daacb193b2565c787741a2668474 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -40,11 +40,14 @@
 
 #include "wx/ioswrap.h"
 
+// Obsolete
+#if 0
 #if wxUSE_IOSTREAMH
     #include <fstream.h>
 #else
     #include <fstream>
 #endif
+#endif
 
 #if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
      && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
@@ -465,8 +468,11 @@ wxMemStruct *wxDebugContext::m_tail = NULL;
 // wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
 
 // Must initialise these in wxEntry, and then delete them just before wxEntry exits
+// Obsolete
+#if 0
 wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
 wxSTD ostream *wxDebugContext::m_debugStream = NULL;
+#endif
 
 bool wxDebugContext::m_checkPrevious = FALSE;
 int wxDebugContext::debugLevel = 1;
@@ -486,7 +492,7 @@ wxDebugContext::wxDebugContext(void)
 
 wxDebugContext::~wxDebugContext(void)
 {
-  SetStream(NULL, NULL);
+//  SetStream(NULL, NULL);
 }
 
 /*
@@ -494,7 +500,9 @@ wxDebugContext::~wxDebugContext(void)
  * between SetFile and SetStream.
  */
 
-void wxDebugContext::SetStream(wxSTD ostream *str, streambuf *buf)
+// Obsolete
+#if 0
+void wxDebugContext::SetStream(wxSTD ostream *str, wxSTD streambuf *buf)
 {
   if (m_debugStream)
   {
@@ -508,7 +516,7 @@ void wxDebugContext::SetStream(wxSTD ostream *str, streambuf *buf)
 #ifndef __WATCOMC__
   if (m_streamBuf)
   {
-    streambuf* oldBuf = m_streamBuf;
+    wxSTD streambuf* oldBuf = m_streamBuf;
     m_streamBuf = NULL;
     delete oldBuf;
   }
@@ -548,7 +556,8 @@ bool wxDebugContext::SetStandardError(void)
 #endif
   return FALSE;
 }
-
+#endif
+    // 0
 
 /*
   Work out the positions of the markers by creating an array of 2 markers
@@ -615,13 +624,13 @@ size_t wxDebugContext::PaddedSize (const size_t size)
 {
     // Added by Terry Farnham <TJRT@pacbell.net> to replace
     // slow GetPadding call.
-       int padb;
+    int padb;
 
-       padb = size & m_balignmask;
-       if(padb)
-               return(size + m_balign - padb);
-       else
-               return(size);
+    padb = size & m_balignmask;
+    if(padb)
+        return(size + m_balign - padb);
+    else
+        return(size);
 
 // Old (slow) code
 #if 0