Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* New wxStream classes: wxStreamBuffer and wxObject*Stream.

Browse Source 
* Changes: ofsInvalid => wxInvalidOffset in filefn.h
* Updates: all wxStream classes use wxStreamBuffer.
           wxObject basic declaration changes (added LoadObject, modified
           StoreObject)
* Some base of the serialization.
(I hope not to have forgotten any files)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-07-24 17:13:47 +00:00
parent 439b3bf1f5
commit 1678ad7802
13 changed files with 324 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.in
View File

@@ -61,6 +61,7 @@ LIB_CPP_SRC=\
common/mstream.cpp \
common/zstream.cpp \
common/datstrm.cpp \
common/objstrm.cpp \
\
gtk/app.cpp \
gtk/bitmap.cpp \

42
src/common/file.cpp
View File

@@ -143,7 +143,7 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int access)
int fd = open(szFileName, O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access);
if ( fd == -1 ) {
wxLogSysError(_("can't create file '%s'"), szFileName);
wxLogSysError("can't create file '%s'", szFileName);
return FALSE;
}
else {
@@ -178,7 +178,7 @@ bool wxFile::Open(const char *szFileName, OpenMode mode, int access)
int fd = open(szFileName, flags, access);
if ( fd == -1 ) {
wxLogSysError(_("can't open file '%s'"), szFileName);
wxLogSysError("can't open file '%s'", szFileName);
return FALSE;
}
else {
@@ -192,7 +192,7 @@ bool wxFile::Close()
{
if ( IsOpened() ) {
if ( close(m_fd) == -1 ) {
wxLogSysError(_("can't close file descriptor %d"), m_fd);
wxLogSysError("can't close file descriptor %d", m_fd);
m_fd = fd_invalid;
return FALSE;
}
@@ -214,8 +214,8 @@ off_t wxFile::Read(void *pBuf, off_t nCount)
int iRc = ::read(m_fd, pBuf, nCount);
if ( iRc == -1 ) {
wxLogSysError(_("can't read from file descriptor %d"), m_fd);
return ofsInvalid;
wxLogSysError("can't read from file descriptor %d", m_fd);
return wxInvalidOffset;
}
else
return (uint)iRc;
@@ -228,22 +228,22 @@ uint wxFile::Write(const void *pBuf, uint nCount)
int iRc = ::write(m_fd, pBuf, nCount);
if ( iRc == -1 ) {
wxLogSysError(_("can't write to file descriptor %d"), m_fd);
wxLogSysError("can't write to file descriptor %d", m_fd);
m_error = TRUE;
return 0;
}
else
return (uint)iRc;
return iRc;
}
// flush
bool wxFile::Flush()
{
if ( IsOpened() ) {
// @@@ fsync() is not ANSI (BSDish)
// @@@ fsync() is not ANSI (BSDish)
// if ( fsync(m_fd) == -1 ) { // TODO
if (TRUE) {
wxLogSysError(_("can't flush file descriptor %d"), m_fd);
wxLogSysError("can't flush file descriptor %d", m_fd);
return FALSE;
}
}
@@ -280,8 +280,8 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode)
int iRc = lseek(m_fd, ofs, flag);
if ( iRc == -1 ) {
wxLogSysError(_("can't seek on file descriptor %d"), m_fd);
return ofsInvalid;
wxLogSysError("can't seek on file descriptor %d", m_fd);
return wxInvalidOffset;
}
else
return (off_t)iRc;
@@ -294,8 +294,8 @@ off_t wxFile::Tell() const
int iRc = tell(m_fd);
if ( iRc == -1 ) {
wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd);
return ofsInvalid;
wxLogSysError("can't get seek position on file descriptor %d", m_fd);
return wxInvalidOffset;
}
else
return (off_t)iRc;
@@ -327,8 +327,8 @@ off_t wxFile::Length() const
#endif //_MSC_VER
if ( iRc == -1 ) {
wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
return ofsInvalid;
wxLogSysError("can't find length of file on file descriptor %d", m_fd);
return wxInvalidOffset;
}
else
return (off_t)iRc;
@@ -345,7 +345,7 @@ bool wxFile::Eof() const
// @@ this doesn't work, of course, on unseekable file descriptors
off_t ofsCur = Tell(),
ofsMax = Length();
if ( ofsCur == ofsInvalid || ofsMax == ofsInvalid )
if ( ofsCur == wxInvalidOffset || ofsMax == wxInvalidOffset )
iRc = -1;
else
iRc = ofsCur == ofsMax;
@@ -361,8 +361,8 @@ bool wxFile::Eof() const
return FALSE;
case -1:
wxLogSysError(_("can't determine if the end of file is reached on "
"descriptor %d"), m_fd);
wxLogSysError("can't determine if the end of file is reached on "
"descriptor %d", m_fd);
break;
default:
@@ -424,12 +424,12 @@ bool wxTempFile::Commit()
m_file.Close();
if ( wxFile::Exists(m_strName) && remove(m_strName) != 0 ) {
wxLogSysError(_("can't remove file '%s'"), m_strName.c_str());
wxLogSysError("can't remove file '%s'", m_strName.c_str());
return FALSE;
}
if ( rename(m_strTemp, m_strName) != 0 ) {
wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str());
wxLogSysError("can't commit changes to file '%s'", m_strName.c_str());
return FALSE;
}
@@ -440,5 +440,5 @@ void wxTempFile::Discard()
{
m_file.Close();
if ( remove(m_strTemp) != 0 )
wxLogSysError(_("can't remove temporary file '%s'"), m_strTemp.c_str());
wxLogSysError("can't remove temporary file '%s'", m_strTemp.c_str());
}

107
src/common/intl.cpp
View File

@@ -10,7 +10,7 @@
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// declaration
// ============================================================================
// ----------------------------------------------------------------------------
@@ -28,19 +28,17 @@
#pragma hdrstop
#endif
// wxWindows
#ifndef WX_PRECOMP
#include "wx/defs.h"
#include "wx/string.h"
#endif //WX_PRECOMP
// standard headers
#include <locale.h>
// wxWindows
#include "wx/defs.h"
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/file.h"
#include "wx/log.h"
#include "wx/utils.h"
// standard headers
#include <locale.h>
#include <stdlib.h>
// ----------------------------------------------------------------------------
@@ -55,23 +53,23 @@ const uint32 MSGCATALOG_MAGIC_SW = 0xde120495;
#define MSGCATALOG_EXTENSION ".mo"
// ----------------------------------------------------------------------------
// global functions (private to this module)
// global functions
// ----------------------------------------------------------------------------
// suppress further error messages about missing translations
// (if you don't have one catalog file, you wouldn't like to see the
// error message for each string in it, so normally it's given only
// once)
static void wxSuppressTransErrors();
void wxSuppressTransErrors();
// restore the logging
static void wxRestoreTransErrors();
void wxRestoreTransErrors();
// get the current state
static bool wxIsLoggingTransErrors();
bool wxIsLoggingTransErrors();
// get the current locale object (@@ may be NULL!)
static wxLocale *wxSetLocale(wxLocale *pLocale);
// get the current locale object (## may be NULL!)
extern wxLocale *wxSetLocale(wxLocale *pLocale);
// ----------------------------------------------------------------------------
// wxMsgCatalog corresponds to one disk-file message catalog.
@@ -199,8 +197,6 @@ wxMsgCatalog::~wxMsgCatalog()
DELETEA(m_pszName);
}
// a helper class which suppresses all translation error messages
// from the moment of it's creation until it's destruction
class NoTransErr
{
public:
@@ -211,15 +207,15 @@ class NoTransErr
// open disk file and read in it's contents
bool wxMsgCatalog::Load(const char *szDirPrefix, const char *szName)
{
// search order (assume language 'lang') is
// 1) $LC_PATH/lang/LC_MESSAGES (if LC_PATH set)
// 2) ./lang/LC_MESSAGES
// 3) ./lang
// search order (assume language 'foo') is
// 1) $LC_PATH/foo/LC_MESSAGES (if LC_PATH set)
// 2) ./foo/LC_MESSAGES
// 3) ./foo
// 4) . (Added by JACS)
//
// under UNIX we search also in:
// 5) /usr/share/locale/lang/LC_MESSAGES (Linux)
// 6) /usr/lib/locale/lang/LC_MESSAGES (Solaris)
// 5) /usr/share/locale/foo/LC_MESSAGES (Linux)
// 6) /usr/lib/locale/foo/LC_MESSAGES (Solaris)
#define MSG_PATH FILE_SEP_PATH + "LC_MESSAGES" PATH_SEP
wxString strPath("");
@@ -229,12 +225,12 @@ bool wxMsgCatalog::Load(const char *szDirPrefix, const char *szName)
// NB: '<<' is unneeded between too literal strings:
// they are concatenated at compile time
strPath << "./" << wxString(szDirPrefix) + MSG_PATH // (2)
<< "./" << szDirPrefix << FILE_SEP_PATH << PATH_SEP // (3)
<< "." << PATH_SEP // (4)
strPath += "./" + wxString(szDirPrefix) + MSG_PATH // (2)
+ "./" + szDirPrefix + FILE_SEP_PATH + PATH_SEP // (3)
+ "." + PATH_SEP
#ifdef __UNIX__
"/usr/share/locale/" << szDirPrefix << MSG_PATH // (5)
"/usr/lib/locale/" << szDirPrefix << MSG_PATH // (6)
"/usr/share/locale/" + szDirPrefix + MSG_PATH // (5)
"/usr/lib/locale/" + szDirPrefix + MSG_PATH // (6)
#endif //UNIX
;
@@ -247,41 +243,38 @@ bool wxMsgCatalog::Load(const char *szDirPrefix, const char *szName)
// (we're using an object because we have several return paths)
NoTransErr noTransErr;
wxLogVerbose(_("looking for catalog '%s' in path '%s'..."),
szName, strPath.c_str());
wxLogVerbose("looking for catalog '%s' in path '%s'.",
szName, strPath.c_str());
wxString strFullName;
if ( !wxFindFileInPath(&strFullName, strPath, strFile) ) {
wxLogWarning(_("catalog file for domain '%s' not found."), szName);
wxLogWarning("catalog file for domain '%s' not found.", szName);
return FALSE;
}
// open file
wxLogVerbose(_("catalog '%s' found in '%s'."), szName, strFullName.c_str());
wxLogVerbose("using catalog '%s' from '%s'.",
szName, strFullName.c_str());
// declare these vars here because we're using goto further down
bool bValid;
off_t nSize;
wxFile fileMsg(strFullName);
if ( !fileMsg.IsOpened() )
goto error;
return FALSE;
// get the file size
nSize = fileMsg.Length();
if ( nSize == ofsInvalid )
goto error;
off_t nSize = fileMsg.Length();
if ( nSize == wxInvalidOffset )
return FALSE;
// read the whole file in memory
m_pData = new uint8[nSize];
if ( fileMsg.Read(m_pData, nSize) != nSize ) {
DELETEA(m_pData);
m_pData = NULL;
goto error;
return FALSE;
}
// examine header
bValid = (size_t)nSize > sizeof(wxMsgCatalogHeader);
bool bValid = (size_t)nSize > sizeof(wxMsgCatalogHeader);
wxMsgCatalogHeader *pHeader;
if ( bValid ) {
@@ -296,8 +289,7 @@ bool wxMsgCatalog::Load(const char *szDirPrefix, const char *szName)
if ( !bValid ) {
// it's either too short or has incorrect magic number
wxLogWarning(_("'%s' is not a valid message catalog."),
strFullName.c_str());
wxLogWarning("'%s' is not a valid message catalog.", strFullName.c_str());
DELETEA(m_pData);
m_pData = NULL;
@@ -306,8 +298,10 @@ bool wxMsgCatalog::Load(const char *szDirPrefix, const char *szName)
// initialize
m_numStrings = Swap(pHeader->numStrings);
m_pOrigTable = (wxMsgTableEntry *)(m_pData + Swap(pHeader->ofsOrigTable));
m_pTransTable = (wxMsgTableEntry *)(m_pData + Swap(pHeader->ofsTransTable));
m_pOrigTable = (wxMsgTableEntry *)(m_pData +
Swap(pHeader->ofsOrigTable));
m_pTransTable = (wxMsgTableEntry *)(m_pData +
Swap(pHeader->ofsTransTable));
m_nHashSize = Swap(pHeader->nHashSize);
m_pHashTable = (uint32 *)(m_pData + Swap(pHeader->ofsHashTable));
@@ -317,11 +311,6 @@ bool wxMsgCatalog::Load(const char *szDirPrefix, const char *szName)
// everything is fine
return TRUE;
error:
wxLogError(_("error opening message catalog '%s', not loaded."),
strFullName.c_str());
return FALSE;
}
// search for a string
@@ -386,12 +375,12 @@ wxLocale::wxLocale(const char *szName,
szLocale = szName;
m_pszOldLocale = setlocale(LC_ALL, szLocale);
if ( m_pszOldLocale == NULL )
wxLogError(_("locale '%s' can not be set."), szLocale);
wxLogError("locale '%s' can not be set.", szLocale);
// the short name will be used to look for catalog files as well,
// so we need something here
if ( m_strShort.IsEmpty() ) {
// @@@@ I don't know how these 2 letter abbreviations are formed,
// #### I don't know how these 2 letter abbreviations are formed,
// this wild guess is almost surely wrong
m_strShort = wxToLower(szLocale[0]) + wxToLower(szLocale[1]);
}
@@ -453,12 +442,11 @@ const char *wxLocale::GetString(const char *szOrigString,
wxSuppressTransErrors();
if ( szDomain != NULL )
wxLogWarning(_("string '%s' not found in domain '%s'"
" for locale '%s'."),
szOrigString, szDomain, m_strLocale.c_str());
wxLogWarning("string '%s' not found in domain '%s' for locale '%s'.",
szOrigString, szDomain, m_strLocale.c_str());
else
wxLogWarning(_("string '%s' not found in locale '%s'."),
szOrigString, m_strLocale.c_str());
wxLogWarning("string '%s' not found in locale '%s'.",
szOrigString, m_strLocale.c_str());
}
return szOrigString;
@@ -537,6 +525,11 @@ bool wxIsLoggingTransErrors()
// the current locale object
wxLocale *g_pLocale = NULL;
wxLocale *wxGetLocale()
{
return g_pLocale;
}
wxLocale *wxSetLocale(wxLocale *pLocale)
{
wxLocale *pOld = g_pLocale;

47
src/common/object.cpp
View File

@@ -20,7 +20,10 @@
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/hash.h"
#include "wx/objstrm.h"
#endif
#include <string.h>
#include <assert.h>
@@ -114,36 +117,6 @@ void wxObject::operator delete[] (void * buf)
* Class info: provides run-time class type information.
*/
#ifdef USE_STORABLE_CLASSES
wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn,
wxStorableConstructorFn stoFn )
{
className = cName;
baseClassName1 = baseName1;
baseClassName2 = baseName2;
objectSize = sz;
objectConstructor = fn;
storableConstructor = stoFn;
next = first;
first = this;
baseInfo1 = NULL;
baseInfo2 = NULL;
}
wxObject* wxClassInfo::CreateObject( istream &stream, char *data )
{
if (storableConstructor)
return (wxObject *)(*storableConstructor)( stream, data );
else
return NULL;
}
#else
wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn constr)
{
className = cName;
@@ -160,8 +133,6 @@ wxClassInfo::wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz,
baseInfo2 = NULL;
}
#endif
wxObject *wxClassInfo::CreateObject(void)
{
if (objectConstructor)
@@ -250,16 +221,10 @@ wxObject *wxCreateDynamicObject(char *name)
#ifdef USE_STORABLE_CLASSES
wxObject* wxCreateStoredObject( char *name, istream &stream, char *data )
wxObject* wxCreateStoredObject( wxInputStream &stream )
{
wxClassInfo *info = wxClassInfo::first;
while (info)
{
if (info->className && strcmp(info->className, name) == 0)
return info->CreateObject( stream, data );
info = info->next;
}
return NULL;
wxObjectInputStream obj_s(stream);
return obj_s.LoadObject();
};
#endif

52
src/common/stream.cpp
View File

@@ -21,6 +21,10 @@
#pragma hdrstop
#endif
// ----------------------------------------------------------------------------
// wxInputStream
// ----------------------------------------------------------------------------
wxInputStream::wxInputStream()
{
}
@@ -44,6 +48,48 @@ wxInputStream& wxInputStream::Read(wxOutputStream& stream_out)
return *this;
}
int wxInputStream::Scanf(const wxString& format, ...)
{
va_list params;
va_start(params, format);
va_end(params);
}
wxInputStream& wxInputStream::operator>>(wxString& line)
{
wxDataInputStream s(*this);
line = s.ReadLine();
return *this;
}
wxInputStream& wxInputStream::operator>>(char& c)
{
c = GetC();
}
wxInputStream& wxInputStream::operator>>(short& i)
{
Scanf("%i", &i);
return *this;
}
wxInputStream& wxInputStream::operator>>(long& i)
{
Scanf("%l", &i);
return *this;
}
wxInputStream& wxInputStream::operator>>(float& f)
{
Scanf("%f", &f);
return *this;
}
// ----------------------------------------------------------------------------
// wxOutputStream
// ----------------------------------------------------------------------------
wxOutputStream::wxOutputStream()
{
}
@@ -58,6 +104,9 @@ wxOutputStream& wxOutputStream::Write(wxInputStream& stream_in)
return *this;
}
// ----------------------------------------------------------------------------
// wxFilterInputStream
// ----------------------------------------------------------------------------
wxFilterInputStream::wxFilterInputStream(wxInputStream& stream)
: wxInputStream()
{
@@ -68,6 +117,9 @@ wxFilterInputStream::~wxFilterInputStream()
{
}
// ----------------------------------------------------------------------------
// wxFilterOutputStream
// ----------------------------------------------------------------------------
wxFilterOutputStream::wxFilterOutputStream(wxOutputStream& stream)
: wxOutputStream()
{

6
src/common/textfile.cpp
View File

@@ -131,7 +131,7 @@ wxTextFile::Type wxTextFile::GuessType() const
// interpret the results (@@ far from being even 50% fool proof)
if ( nDos + nUnix + nMac == 0 ) {
// no newlines at all
wxLogWarning(_("'%s' is probably a binary file."), m_strFile.c_str());
wxLogWarning("'%s' is probably a binary file.", m_strFile.c_str());
}
else {
#define GREATER_OF(t1, t2) n##t1 == n##t2 ? typeDefault \
@@ -164,7 +164,7 @@ bool wxTextFile::Read()
int n, nRead;
while ( !m_file.Eof() ) {
nRead = m_file.Read(buf, WXSIZEOF(buf));
if ( nRead == ofsInvalid ) {
if ( nRead == wxInvalidOffset ) {
// read error (error message already given in wxFile::Read)
m_file.Close();
return FALSE;
@@ -224,7 +224,7 @@ bool wxTextFile::Write(Type typeNew)
wxTempFile fileTmp(m_strFile);
if ( !fileTmp.IsOpened() ) {
wxLogError(_("can't write file '%s' to disk."), m_strFile.c_str());
wxLogError("can't write file '%s' to disk.", m_strFile.c_str());
return FALSE;
}