Added Ok() member for print data, print dialog, page dialog, page dialog data

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

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 6679675ab01afbb47204daa03455087ab520c692..df54d3664c57daacb193b2565c787741a2668474 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -40,11 +40,14 @@
 
 #include "wx/ioswrap.h"
 
 
 #include "wx/ioswrap.h"
 

+// Obsolete
+#if 0

 #if wxUSE_IOSTREAMH
     #include <fstream.h>
 #else
     #include <fstream>
 #endif
 #if wxUSE_IOSTREAMH
     #include <fstream.h>
 #else
     #include <fstream>
 #endif

+#endif

 
 #if !defined(__WATCOMC__) && !(defined(__VMS__) && ( __VMS_VER < 70000000 ) )\
      && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
 
 #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
 // 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;
 wxSTD streambuf *wxDebugContext::m_streamBuf = NULL;
 wxSTD ostream *wxDebugContext::m_debugStream = NULL;

+#endif

 
 bool wxDebugContext::m_checkPrevious = FALSE;
 int wxDebugContext::debugLevel = 1;
 
 bool wxDebugContext::m_checkPrevious = FALSE;
 int wxDebugContext::debugLevel = 1;


@@ -486,7 +492,7 @@ wxDebugContext::wxDebugContext(void)
 
 wxDebugContext::~wxDebugContext(void)
 {
 
 wxDebugContext::~wxDebugContext(void)
 {

-  SetStream(NULL, NULL);
+//  SetStream(NULL, NULL);

 }
 
 /*
 }
 
 /*


@@ -494,6 +500,8 @@ wxDebugContext::~wxDebugContext(void)
  * between SetFile and SetStream.
  */
 
  * between SetFile and SetStream.
  */
 

+// Obsolete
+#if 0

 void wxDebugContext::SetStream(wxSTD ostream *str, wxSTD streambuf *buf)
 {
   if (m_debugStream)
 void wxDebugContext::SetStream(wxSTD ostream *str, wxSTD streambuf *buf)
 {
   if (m_debugStream)


@@ -548,7 +556,8 @@ bool wxDebugContext::SetStandardError(void)
 #endif
   return FALSE;
 }
 #endif
   return FALSE;
 }

-
+#endif
+    // 0

 
 /*
   Work out the positions of the markers by creating an array of 2 markers
 
 /*
   Work out the positions of the markers by creating an array of 2 markers