wxTextFile::Close() implemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -80,7 +80,7 @@ public:
 | 
			
		||||
    // lines, i.e. you may write something like:
 | 
			
		||||
    //  for ( str = GetFirstLine(); !Eof(); str = GetNextLine() ) { ... }
 | 
			
		||||
 | 
			
		||||
    // @@@ const is commented out because not all compilers understand
 | 
			
		||||
    // NB: const is commented out because not all compilers understand
 | 
			
		||||
    //     'mutable' keyword yet (m_nCurLine should be mutable)
 | 
			
		||||
  wxString& GetFirstLine() /* const */ { return m_aLines[m_nCurLine = 0]; }
 | 
			
		||||
  wxString& GetNextLine()  /* const */ { return m_aLines[++m_nCurLine];   }
 | 
			
		||||
 
 | 
			
		||||
@@ -71,6 +71,7 @@ wxTextFile::~wxTextFile()
 | 
			
		||||
bool wxTextFile::Open(const wxString& strFile)
 | 
			
		||||
{
 | 
			
		||||
  m_strFile = strFile;
 | 
			
		||||
 | 
			
		||||
  return Open();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -138,9 +139,7 @@ wxTextFileType wxTextFile::GuessType() const
 | 
			
		||||
                                                    : wxTextFileType_##t2
 | 
			
		||||
 | 
			
		||||
    // Watcom C++ doesn't seem to be able to handle the macro
 | 
			
		||||
#if defined(__WATCOMC__)
 | 
			
		||||
    return typeDefault;
 | 
			
		||||
#else
 | 
			
		||||
#if !defined(__WATCOMC__)
 | 
			
		||||
    if ( nDos > nUnix )
 | 
			
		||||
      return GREATER_OF(Dos, Mac);
 | 
			
		||||
    else if ( nDos < nUnix )
 | 
			
		||||
@@ -149,7 +148,7 @@ wxTextFileType wxTextFile::GuessType() const
 | 
			
		||||
      // nDos == nUnix
 | 
			
		||||
      return nMac > nDos ? wxTextFileType_Mac : typeDefault;
 | 
			
		||||
    }
 | 
			
		||||
#endif
 | 
			
		||||
#endif // __WATCOMC__
 | 
			
		||||
 | 
			
		||||
    #undef    GREATER_OF
 | 
			
		||||
  }
 | 
			
		||||
@@ -221,6 +220,15 @@ bool wxTextFile::Read()
 | 
			
		||||
  return TRUE;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool wxTextFile::Close()
 | 
			
		||||
{
 | 
			
		||||
    m_aTypes.Clear();
 | 
			
		||||
    m_aLines.Clear();
 | 
			
		||||
    m_nCurLine = 0;
 | 
			
		||||
 | 
			
		||||
    return TRUE;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool wxTextFile::Write(wxTextFileType typeNew)
 | 
			
		||||
{
 | 
			
		||||
  wxTempFile fileTmp(m_strFile);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user