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

corrected return type of wxDetermineImageType

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2002-07-13 12:14:07 +00:00
parent e626d7c787
commit 723c433f65
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utils/emulator/src/emulator.cpp
View File

@@ -37,6 +37,7 @@
#include "wx/confbase.h" #include "wx/confbase.h"
#include "wx/fileconf.h" #include "wx/fileconf.h"
#include "wx/cmdline.h" #include "wx/cmdline.h"
#include "wx/image.h"
#ifdef __WXX11__ #ifdef __WXX11__
#include "wx/x11/reparent.h" #include "wx/x11/reparent.h"
@@ -487,8 +488,8 @@ bool wxEmulatorInfo::Load(const wxString& appDir)
return FALSE; return FALSE;
} }
int type = wxDetermineImageType(m_emulatorBackgroundBitmapName); wxBitmapType type = wxDetermineImageType(m_emulatorBackgroundBitmapName);
if (type == -1) if (type == wxBITMAP_TYPE_INVALID)
return FALSE; return FALSE;
if (!m_emulatorBackgroundBitmap.LoadFile(m_emulatorBackgroundBitmapName, type)) if (!m_emulatorBackgroundBitmap.LoadFile(m_emulatorBackgroundBitmapName, type))
@@ -505,7 +506,7 @@ bool wxEmulatorInfo::Load(const wxString& appDir)
} }
// Returns the image type, or -1, determined from the extension. // Returns the image type, or -1, determined from the extension.
int wxDetermineImageType(const wxString& filename) wxBitmapType wxDetermineImageType(const wxString& filename)
{ {
wxString path, name, ext; wxString path, name, ext;
@@ -514,18 +515,18 @@ int wxDetermineImageType(const wxString& filename)
ext.MakeLower(); ext.MakeLower();
if (ext == "jpg" || ext == "jpeg") if (ext == "jpg" || ext == "jpeg")
return wxBITMAP_TYPE_JPEG; return wxBITMAP_TYPE_JPEG;
else if (ext == "gif") if (ext == "gif")
return wxBITMAP_TYPE_GIF; return wxBITMAP_TYPE_GIF;
else if (ext == "bmp") if (ext == "bmp")
return wxBITMAP_TYPE_BMP; return wxBITMAP_TYPE_BMP;
else if (ext == "png") if (ext == "png")
return wxBITMAP_TYPE_PNG; return wxBITMAP_TYPE_PNG;
else if (ext == "pcx") if (ext == "pcx")
return wxBITMAP_TYPE_PCX; return wxBITMAP_TYPE_PCX;
else if (ext == "tif" || ext == "tiff") if (ext == "tif" || ext == "tiff")
return wxBITMAP_TYPE_TIF; return wxBITMAP_TYPE_TIF;
else
return -1; return wxBITMAP_TYPE_INVALID;
} }
// Convert a colour to a 6-digit hex string // Convert a colour to a 6-digit hex string

2
utils/emulator/src/emulator.h
View File

@@ -152,7 +152,7 @@ enum
}; };
// Returns the image type, or -1, determined from the extension. // Returns the image type, or -1, determined from the extension.
int wxDetermineImageType(const wxString& filename); wxBitmapType wxDetermineImageType(const wxString& filename);
// Convert a colour to a 6-digit hex string // Convert a colour to a 6-digit hex string
wxString wxColourToHexString(const wxColour& col); wxString wxColourToHexString(const wxColour& col);