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

change longs used for bitmap types to wxBitmapType (#9126)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-06-06 23:33:58 +00:00
parent 9543d01ca1
commit e98e625cbb
7 changed files with 92 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -186,6 +186,10 @@ Changes in behaviour which may result in compilation errors
wxConfig now tries to convert all unknown types to wxString automatically.
The simplest solution is to cast the enum value to int.
- Several wxImage methods which previously had "long bitmaptype" parameters
have been changed to accept "wxBitmapType bitmaptype", please use enum
wxBitmapType in your code.
Deprecated methods and their replacements
-----------------------------------------

4
include/wx/iconbndl.h
View File

@@ -35,7 +35,7 @@ public:
wxIconBundle();
// initializes the bundle with the icon(s) found in the file
wxIconBundle(const wxString& file, long type);
wxIconBundle(const wxString& file, wxBitmapType type);
// initializes the bundle with a single icon
wxIconBundle(const wxIcon& icon);
@@ -50,7 +50,7 @@ public:
// adds all the icons contained in the file to the collection,
// if the collection already contains icons with the same
// width and height, they are replaced
void AddIcon(const wxString& file, long type);
void AddIcon(const wxString& file, wxBitmapType type);
// adds the icon to the collection, if the collection already
// contains an icon with the same width and height, it is

28
include/wx/image.h
View File

@@ -90,7 +90,7 @@ class WXDLLIMPEXP_CORE wxImageHandler: public wxObject
{
public:
wxImageHandler()
: m_name(wxEmptyString), m_extension(wxEmptyString), m_mime(), m_type(0)
: m_name(wxEmptyString), m_extension(wxEmptyString), m_mime(), m_type(wxBITMAP_TYPE_INVALID)
{ }
#if wxUSE_STREAMS
@@ -105,11 +105,11 @@ public:
void SetName(const wxString& name) { m_name = name; }
void SetExtension(const wxString& ext) { m_extension = ext; }
void SetType(long type) { m_type = type; }
void SetType(wxBitmapType type) { m_type = type; }
void SetMimeType(const wxString& type) { m_mime = type; }
const wxString& GetName() const { return m_name; }
const wxString& GetExtension() const { return m_extension; }
long GetType() const { return m_type; }
wxBitmapType GetType() const { return m_type; }
const wxString& GetMimeType() const { return m_mime; }
protected:
@@ -130,7 +130,7 @@ protected:
wxString m_name;
wxString m_extension;
wxString m_mime;
long m_type;
wxBitmapType m_type;
private:
DECLARE_CLASS(wxImageHandler)
@@ -212,12 +212,12 @@ public:
wxImage( int width, int height, bool clear = true );
wxImage( int width, int height, unsigned char* data, bool static_data = false );
wxImage( int width, int height, unsigned char* data, unsigned char* alpha, bool static_data = false );
wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
wxImage( const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 );
wxImage( const wxString& name, const wxString& mimetype, int index = -1 );
wxImage( const char* const* xpmData );
#if wxUSE_STREAMS
wxImage( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 );
wxImage( wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 );
wxImage( wxInputStream& stream, const wxString& mimetype, int index = -1 );
#endif // wxUSE_STREAMS
@@ -327,23 +327,23 @@ public:
bool ConvertColourToAlpha( unsigned char r, unsigned char g, unsigned char b );
static bool CanRead( const wxString& name );
static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
static int GetImageCount( const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY );
virtual bool LoadFile( const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 );
virtual bool LoadFile( const wxString& name, const wxString& mimetype, int index = -1 );
#if wxUSE_STREAMS
static bool CanRead( wxInputStream& stream );
static int GetImageCount( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY );
virtual bool LoadFile( wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1 );
static int GetImageCount( wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY );
virtual bool LoadFile( wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1 );
virtual bool LoadFile( wxInputStream& stream, const wxString& mimetype, int index = -1 );
#endif
virtual bool SaveFile( const wxString& name ) const;
virtual bool SaveFile( const wxString& name, int type ) const;
virtual bool SaveFile( const wxString& name, wxBitmapType type ) const;
virtual bool SaveFile( const wxString& name, const wxString& mimetype ) const;
#if wxUSE_STREAMS
virtual bool SaveFile( wxOutputStream& stream, int type ) const;
virtual bool SaveFile( wxOutputStream& stream, wxBitmapType type ) const;
virtual bool SaveFile( wxOutputStream& stream, const wxString& mimetype ) const;
#endif
@@ -412,8 +412,8 @@ public:
static void InsertHandler( wxImageHandler *handler );
static bool RemoveHandler( const wxString& name );
static wxImageHandler *FindHandler( const wxString& name );
static wxImageHandler *FindHandler( const wxString& extension, long imageType );
static wxImageHandler *FindHandler( long imageType );
static wxImageHandler *FindHandler( const wxString& extension, wxBitmapType imageType );
static wxImageHandler *FindHandler( wxBitmapType imageType );
static wxImageHandler *FindHandlerMime( const wxString& mimetype );
static wxString GetImageExtWildcard();

4
interface/iconbndl.h
View File

@@ -28,7 +28,7 @@ public:
Copy constructor.
*/
wxIconBundle();
wxIconBundle(const wxString& file, long type);
wxIconBundle(const wxString& file, wxBitmapType type);
wxIconBundle(const wxIcon& icon);
wxIconBundle(const wxIconBundle& ic);
//@}
@@ -44,7 +44,7 @@ public:
contains an icon with the same width and height, it is
replaced by the new one.
*/
void AddIcon(const wxString& file, long type);
void AddIcon(const wxString& file, wxBitmapType type);
void AddIcon(const wxIcon& icon);
//@}

18
interface/image.h
View File

@@ -74,7 +74,7 @@ public:
/**
Gets the image type associated with this handler.
*/
long GetType() const;
wxBitmapType GetType() const;
/**
Loads a image from a stream, putting the resulting data into @e image. If the
@@ -265,7 +265,7 @@ public:
@see LoadFile()
*/
wxImage(const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1);
wxImage(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1);
/**
Creates an image from a file using MIME-types to specify the type.
@@ -292,7 +292,7 @@ public:
@param index
See above.
*/
wxImage(wxInputStream& stream, long type = wxBITMAP_TYPE_ANY, int index = -1);
wxImage(wxInputStream& stream, wxBitmapType type = wxBITMAP_TYPE_ANY, int index = -1);
/**
Creates an image from a stream using MIME-types to specify the type.
@@ -458,8 +458,8 @@ public:
*/
static wxImageHandler* FindHandler(const wxString& name);
static wxImageHandler* FindHandler(const wxString& extension,
long imageType);
static wxImageHandler* FindHandler(long imageType);
wxBitmapType imageType);
static wxImageHandler* FindHandler(wxBitmapType imageType);
static wxImageHandler* FindHandlerMime(const wxString& mimetype);
//@}
@@ -542,9 +542,9 @@ public:
(exceptions are TIFF and ICO formats).
*/
static int GetImageCount(const wxString& filename,
long type = wxBITMAP_TYPE_ANY);
wxBitmapType type = wxBITMAP_TYPE_ANY);
static int GetImageCount(wxInputStream& stream,
long type = wxBITMAP_TYPE_ANY);
wxBitmapType type = wxBITMAP_TYPE_ANY);
//@}
/**
@@ -751,11 +751,11 @@ public:
@see SaveFile()
*/
bool LoadFile(const wxString& name,
long type = wxBITMAP_TYPE_ANY,
wxBitmapType type = wxBITMAP_TYPE_ANY,
int index = -1);
bool LoadFile(const wxString& name, const wxString& mimetype,
int index = -1);
bool LoadFile(wxInputStream& stream, long type,
bool LoadFile(wxInputStream& stream, wxBitmapType type,
int index = -1);
bool LoadFile(wxInputStream& stream,
const wxString& mimetype,

5
src/common/iconbndl.cpp
View File

@@ -68,7 +68,7 @@ wxIconBundle::wxIconBundle()
{
}
wxIconBundle::wxIconBundle(const wxString& file, long type)
wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
: wxGDIObject()
{
AddIcon(file, type);
@@ -101,7 +101,7 @@ void wxIconBundle::DeleteIcons()
UnRef();
}
void wxIconBundle::AddIcon(const wxString& file, long type)
void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
{
#ifdef __WXMAC__
// Deal with standard icons
@@ -238,3 +238,4 @@ wxIcon wxIconBundle::GetIconByIndex(size_t n) const
return M_ICONBUNDLEDATA->m_icons[n];
}

55
src/common/image.cpp
View File

@@ -140,7 +140,7 @@ wxImage::wxImage( int width, int height, unsigned char* data, unsigned char* alp
Create( width, height, data, alpha, static_data );
}
wxImage::wxImage( const wxString& name, long type, int index )
wxImage::wxImage( const wxString& name, wxBitmapType type, int index )
{
LoadFile( name, type, index );
}
@@ -151,7 +151,7 @@ wxImage::wxImage( const wxString& name, const wxString& mimetype, int index )
}
#if wxUSE_STREAMS
wxImage::wxImage( wxInputStream& stream, long type, int index )
wxImage::wxImage( wxInputStream& stream, wxBitmapType type, int index )
{
LoadFile( stream, type, index );
}
@@ -2014,7 +2014,7 @@ bool wxImage::HasOption(const wxString& name) const
// ----------------------------------------------------------------------------
bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
long WXUNUSED_UNLESS_STREAMS(type),
wxBitmapType WXUNUSED_UNLESS_STREAMS(type),
int WXUNUSED_UNLESS_STREAMS(index) )
{
#if HAS_FILE_STREAMS
@@ -2058,24 +2058,23 @@ bool wxImage::LoadFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
}
bool wxImage::SaveFile( const wxString& filename ) const
{
wxString ext = filename.AfterLast('.').Lower();
wxImageHandler * pHandler = FindHandler(ext, -1);
if (pHandler)
wxImageHandler *handler = FindHandler(ext, wxBITMAP_TYPE_ANY);
if ( !handler)
{
return SaveFile(filename, pHandler->GetType());
}
wxLogError(_("Can't save image to file '%s': unknown extension."), filename.c_str());
wxLogError(_("Can't save image to file '%s': unknown extension."),
filename);
return false;
}
return SaveFile(filename, handler->GetType());
}
bool wxImage::SaveFile( const wxString& WXUNUSED_UNLESS_STREAMS(filename),
int WXUNUSED_UNLESS_STREAMS(type) ) const
wxBitmapType WXUNUSED_UNLESS_STREAMS(type) ) const
{
#if HAS_FILE_STREAMS
wxCHECK_MSG( Ok(), false, wxT("invalid image") );
@@ -2125,7 +2124,7 @@ bool wxImage::CanRead( const wxString& WXUNUSED_UNLESS_STREAMS(name) )
}
int wxImage::GetImageCount( const wxString& WXUNUSED_UNLESS_STREAMS(name),
long WXUNUSED_UNLESS_STREAMS(type) )
wxBitmapType WXUNUSED_UNLESS_STREAMS(type) )
{
#if HAS_FILE_STREAMS
wxImageFileInputStream stream(name);
@@ -2152,7 +2151,7 @@ bool wxImage::CanRead( wxInputStream &stream )
return false;
}
int wxImage::GetImageCount( wxInputStream &stream, long type )
int wxImage::GetImageCount( wxInputStream &stream, wxBitmapType type )
{
wxImageHandler *handler;
@@ -2197,7 +2196,7 @@ int wxImage::GetImageCount( wxInputStream &stream, long type )
}
}
bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
{
UnRef();
@@ -2225,13 +2224,12 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
return false;
}
//else: have specific type
handler = FindHandler(type);
if (handler == 0)
if ( !handler )
{
wxLogWarning( _("No image handler for type %ld defined."), type );
return false;
}
@@ -2240,7 +2238,7 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
wxLogError(_("Image file is not of type %ld."), type);
return false;
}
else
return handler->LoadFile(this, stream, true/*verbose*/, index);
}
@@ -2252,10 +2250,9 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
wxImageHandler *handler = FindHandlerMime(mimetype);
if (handler == 0)
if ( !handler )
{
wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
return false;
}
@@ -2264,11 +2261,11 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
wxLogError(_("Image file is not of type %s."), mimetype);
return false;
}
else
return handler->LoadFile( this, stream, true/*verbose*/, index );
}
bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
bool wxImage::SaveFile( wxOutputStream& stream, wxBitmapType type ) const
{
wxCHECK_MSG( Ok(), false, wxT("invalid image") );
@@ -2276,7 +2273,6 @@ bool wxImage::SaveFile( wxOutputStream& stream, int type ) const
if ( !handler )
{
wxLogWarning( _("No image handler for type %d defined."), type );
return false;
}
@@ -2291,12 +2287,11 @@ bool wxImage::SaveFile( wxOutputStream& stream, const wxString& mimetype ) const
if ( !handler )
{
wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
return false;
}
return handler->SaveFile( (wxImage*)this, stream );
}
#endif // wxUSE_STREAMS
// ----------------------------------------------------------------------------
@@ -2366,21 +2361,23 @@ wxImageHandler *wxImage::FindHandler( const wxString& name )
return NULL;
}
wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
wxImageHandler *wxImage::FindHandler( const wxString& extension, wxBitmapType bitmapType )
{
wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)
{
wxImageHandler *handler = (wxImageHandler*)node->GetData();
if ( (handler->GetExtension().Cmp(extension) == 0) &&
(bitmapType == -1 || handler->GetType() == bitmapType) )
( (bitmapType == wxBITMAP_TYPE_ANY) || (handler->GetType() == bitmapType)) )
{
return handler;
}
node = node->GetNext();
}
return NULL;
}
wxImageHandler *wxImage::FindHandler( long bitmapType )
wxImageHandler *wxImage::FindHandler(wxBitmapType bitmapType )
{
wxList::compatibility_iterator node = sm_handlers.GetFirst();
while (node)