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

1. wxImageHandler::DoCanRead() introduced to solve the virtual function name

Browse Source 
hiding problem
2. wxPNMHandler::CanRead() shouldn't use wxT() - should it?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-15 16:59:32 +00:00
parent 52f13e4930
commit 995612e2ab
8 changed files with 129 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/wx/image.h
View File

@@ -62,20 +62,22 @@ public:
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
virtual bool CanRead( wxInputStream& stream ); bool CanRead( wxInputStream& stream ) { return DoCanRead(stream); }
virtual bool CanRead( const wxString& name ); bool CanRead( const wxString& name );
#endif #endif
inline void SetName(const wxString& name) { m_name = name; } void SetName(const wxString& name) { m_name = name; }
inline void SetExtension(const wxString& ext) { m_extension = ext; } void SetExtension(const wxString& ext) { m_extension = ext; }
inline void SetType(long type) { m_type = type; } void SetType(long type) { m_type = type; }
inline void SetMimeType(const wxString& type) { m_mime = type; } void SetMimeType(const wxString& type) { m_mime = type; }
inline wxString GetName() const { return m_name; } wxString GetName() const { return m_name; }
inline wxString GetExtension() const { return m_extension; } wxString GetExtension() const { return m_extension; }
inline long GetType() const { return m_type; } long GetType() const { return m_type; }
inline wxString GetMimeType() const { return m_mime; } wxString GetMimeType() const { return m_mime; }
protected: protected:
virtual bool DoCanRead( wxInputStream& stream ) = 0;
wxString m_name; wxString m_name;
wxString m_extension; wxString m_extension;
wxString m_mime; wxString m_mime;
@@ -105,10 +107,7 @@ public:
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
virtual bool CanRead( wxInputStream& stream ); virtual bool DoCanRead( wxInputStream& stream );
private:
// hiding base class virtuals again!
inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
#endif #endif
}; };
#endif #endif
@@ -135,10 +134,7 @@ public:
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
virtual bool CanRead( wxInputStream& stream ); virtual bool DoCanRead( wxInputStream& stream );
private:
// hiding base class virtuals again!
inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
#endif #endif
}; };
#endif #endif
@@ -163,10 +159,7 @@ public:
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
virtual bool CanRead( wxInputStream& stream ); virtual bool DoCanRead( wxInputStream& stream );
private:
// hiding base class virtuals again!
inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
#endif #endif
}; };
@@ -193,10 +186,7 @@ public:
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
virtual bool CanRead( wxInputStream& stream ); virtual bool DoCanRead( wxInputStream& stream );
private:
// hiding base class virtuals again!
inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
#endif #endif
}; };
#endif #endif
@@ -223,10 +213,7 @@ public:
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
virtual bool CanRead( wxInputStream& stream ); virtual bool DoCanRead( wxInputStream& stream );
private:
// hiding base class virtuals again!
inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
#endif #endif
}; };
#endif #endif
@@ -253,8 +240,7 @@ public:
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE ); virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
virtual bool CanRead( wxInputStream& stream ); virtual bool DoCanRead( wxInputStream& stream );
#endif
}; };
#endif #endif

2
src/common/imagbmp.cpp
View File

@@ -401,7 +401,7 @@ bool wxBMPHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
return TRUE; return TRUE;
} }
bool wxBMPHandler::CanRead( wxInputStream& stream ) bool wxBMPHandler::DoCanRead( wxInputStream& stream )
{ {
unsigned char hdr[2]; unsigned char hdr[2];

5
src/common/image.cpp
View File

@@ -642,11 +642,6 @@ bool wxImageHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSE
return FALSE; return FALSE;
} }
bool wxImageHandler::CanRead( wxInputStream& WXUNUSED(stream) )
{
return FALSE;
}
bool wxImageHandler::CanRead( const wxString& name ) bool wxImageHandler::CanRead( const wxString& name )
{ {
#if wxUSE_STREAMS #if wxUSE_STREAMS

2
src/common/imaggif.cpp
View File

@@ -79,7 +79,7 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
return FALSE; return FALSE;
} }
bool wxGIFHandler::CanRead( wxInputStream& stream ) bool wxGIFHandler::DoCanRead( wxInputStream& stream )
{ {
wxGIFDecoder *decod; wxGIFDecoder *decod;
bool ok; bool ok;

5
src/common/imagjpeg.cpp
View File

@@ -28,7 +28,8 @@
#include "wx/debug.h" #include "wx/debug.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/app.h" #include "wx/app.h"
extern "C" { extern "C"
{
#include "jpeglib.h" #include "jpeglib.h"
} }
#include "wx/filefn.h" #include "wx/filefn.h"
@@ -311,7 +312,7 @@ bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo
} }
bool wxJPEGHandler::CanRead( wxInputStream& stream ) bool wxJPEGHandler::DoCanRead( wxInputStream& stream )
{ {
unsigned char hdr[2]; unsigned char hdr[2];

2
src/common/imagpcx.cpp
View File

@@ -263,7 +263,7 @@ bool wxPCXHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(
return FALSE; return FALSE;
} }
bool wxPCXHandler::CanRead( wxInputStream& stream ) bool wxPCXHandler::DoCanRead( wxInputStream& stream )
{ {
unsigned char c; unsigned char c;
off_t pos; off_t pos;

2
src/common/imagpng.cpp
View File

@@ -347,7 +347,7 @@ bool wxPNGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
return TRUE; return TRUE;
} }
bool wxPNGHandler::CanRead( wxInputStream& stream ) bool wxPNGHandler::DoCanRead( wxInputStream& stream )
{ {
unsigned char hdr[4]; unsigned char hdr[4];

9
src/common/imagpnm.cpp
View File

@@ -137,19 +137,22 @@ bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUS
return (stream.LastError()==wxStream_NOERROR); return (stream.LastError()==wxStream_NOERROR);
} }
bool wxPNMHandler::CanRead( wxInputStream& stream ) bool wxPNMHandler::DoCanRead( wxInputStream& stream )
{ {
off_t pos = stream.TellI(); off_t pos = stream.TellI();
Skip_Comment(stream); Skip_Comment(stream);
if (stream.GetC()==wxT('P')) if ( stream.GetC() == 'P' )
{
switch (stream.GetC()) switch (stream.GetC())
{ {
case wxT('3'): case wxT('6'): case '3':
case '6':
stream.SeekI(pos); stream.SeekI(pos);
return TRUE; return TRUE;
} }
}
stream.SeekI(pos); stream.SeekI(pos);
return FALSE; return FALSE;