added default values for SetSizeHints() arguments, as in wxMSW

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 92f28769aca877a0c4473e0d1a67e703684124d0..e676282b7a072573981535c54386ffbb4dcac421 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -28,15 +28,18 @@
 
 #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>
 #else
 #if wxUSE_IOSTREAMH
     // N.B. BC++ doesn't have istream.h, ostream.h
 #   include <iostream.h>
 #else

-#   include <ostream>
+#   include <iostream>

 #   if defined(__VISUALC__) || defined(__MWERKS__)
 #   if defined(__VISUALC__) || defined(__MWERKS__)

-        using namespace std;
+//        using namespace std;

 #   endif
 #endif
 #   endif
 #endif

+#endif

 
 #ifdef __WXDEBUG__
 
 
 #ifdef __WXDEBUG__
 


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

-    static streambuf *m_streamBuf;
-    static ostream *m_debugStream;
+    // Obsolete
+#if 0
+    static wxSTD streambuf *m_streamBuf;
+    static wxSTD ostream *m_debugStream;
+#endif

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

-       static int m_balign;                    // byte alignment
-       static int m_balignmask;                // mask for performing byte alignment
+    static int m_balign;            // byte alignment
+    static int m_balignmask;        // mask for performing byte alignment

 public:
     // Set a checkpoint to dump only the memory from
     // a given point
 public:
     // Set a checkpoint to dump only the memory from
     // a given point


@@ -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 bool HasStream(void) { return (m_debugStream != NULL); };

-    static ostream& GetStream(void) { return *m_debugStream; }
-    static streambuf *GetStreamBuf(void) { return m_streamBuf; }
-    static void SetStream(ostream *stream, streambuf *buf = 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 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; }