Eliminated some warnings under Windows; wxGetHomeDir problem in wxFile;
eliminated memory leak report by making class table dynamically allocated/freed; tidied up names in wxClassInfo. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -8,14 +8,26 @@
|
||||
// Copyright: (c) Guilhem Lavaux
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_WXFSTREAM_H__
|
||||
#define _WX_WXFSTREAM_H__
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface "fstream.h"
|
||||
#endif
|
||||
|
||||
#include <wx/object.h>
|
||||
#include <wx/string.h>
|
||||
#include <wx/stream.h>
|
||||
#include <wx/file.h>
|
||||
|
||||
// Disable warnings such as
|
||||
// 'wxFileStream' : inherits 'wxFileInputStream::Peek' via dominance
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(disable:4250)
|
||||
#endif
|
||||
|
||||
class wxFileStreamBase {
|
||||
protected:
|
||||
wxFile *m_file;
|
||||
@@ -69,4 +81,8 @@ class wxFileStream: public wxStream,
|
||||
virtual ~wxFileStream();
|
||||
};
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(default:4250)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user