AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OS/2 port: reorganized wxBitmap/wxBitmapHandler classes to use wxBitmapType

Browse Source 
instead of "long" where possible; made them const-correct etc. (see r52820)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis 2008-03-29 19:34:37 +00:00
parent bf2ede051c
commit 6b5c2d5262
6 changed files with 68 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/wx/os2/bitmap.h
View File

@ -26,6 +26,7 @@ class WXDLLIMPEXP_FWD_CORE wxMask;
class WXDLLIMPEXP_FWD_CORE wxCursor; class WXDLLIMPEXP_FWD_CORE wxCursor;
class WXDLLIMPEXP_FWD_CORE wxControl; class WXDLLIMPEXP_FWD_CORE wxControl;
class WXDLLIMPEXP_FWD_CORE wxImage; class WXDLLIMPEXP_FWD_CORE wxImage;
class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Bitmap data // Bitmap data
@ -96,17 +97,17 @@ public:
// Load a resource // Load a resource
wxBitmap( int nId wxBitmap( int nId
,long lType = wxBITMAP_TYPE_BMP_RESOURCE ,wxBitmapType lType = wxBITMAP_TYPE_BMP_RESOURCE
); );
// For compatiability with other ports, under OS/2 does same as default ctor // For compatiability with other ports, under OS/2 does same as default ctor
inline wxBitmap( const wxString& WXUNUSED(rFilename) inline wxBitmap( const wxString& WXUNUSED(rFilename)
,long WXUNUSED(lType) ,wxBitmapType WXUNUSED(lType)
) )
{ Init(); } { Init(); }
// New constructor for generalised creation from data // New constructor for generalised creation from data
wxBitmap( const void* pData wxBitmap( const void* pData
,long lType ,wxBitmapType lType
,int nWidth ,int nWidth
,int nHeight ,int nHeight
,int nDepth = 1 ,int nDepth = 1
@ -154,25 +155,29 @@ public:
,int nDepth = -1 ,int nDepth = -1
); );
virtual bool Create( const void* pData virtual bool Create( const void* pData
,long lType ,wxBitmapType lType
,int nWidth ,int nWidth
,int nHeight ,int nHeight
,int nDepth = 1 ,int nDepth = 1
); );
virtual bool LoadFile( int nId virtual bool LoadFile( int nId
,long lType = wxBITMAP_TYPE_BMP_RESOURCE ,wxBitmapType lType = wxBITMAP_TYPE_BMP_RESOURCE
); );
virtual bool LoadFile( const wxString& rName virtual bool LoadFile( const wxString& rName
,long lType = wxBITMAP_TYPE_XPM ,wxBitmapType lType = wxBITMAP_TYPE_XPM
); );
virtual bool SaveFile( const wxString& rName virtual bool SaveFile( const wxString& rName
,int lType ,wxBitmapType lType
,const wxPalette* pCmap = NULL ,const wxPalette* pCmap = NULL
); );
inline wxBitmapRefData* GetBitmapData() const inline wxBitmapRefData* GetBitmapData() const
{ return (wxBitmapRefData *)m_refData; } { return (wxBitmapRefData *)m_refData; }
// raw bitmap access support functions
void *GetRawData(wxPixelDataBase& data, int bpp);
void UngetRawData(wxPixelDataBase& data);
inline int GetQuality() const inline int GetQuality() const
{ return (GetBitmapData() ? GetBitmapData()->m_nQuality : 0); } { return (GetBitmapData() ? GetBitmapData()->m_nQuality : 0); }
@ -324,26 +329,26 @@ public:
virtual bool Create( wxGDIImage* pImage virtual bool Create( wxGDIImage* pImage
,const void* pData ,const void* pData
,long lFlags ,wxBitmapType lFlags
,int nWidth ,int nWidth
,int nHeight ,int nHeight
,int nDepth = 1 ,int nDepth = 1
); );
virtual bool Load( wxGDIImage* pImage virtual bool Load( wxGDIImage* pImage
,int nId ,int nId
,long lFlags ,wxBitmapType lFlags
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight
); );
virtual bool Save( wxGDIImage* pImage virtual bool Save( const wxGDIImage* pImage
,const wxString& rName ,const wxString& rName
,int lType ,wxBitmapType lType
) const; ) const;
private: private:
inline virtual bool Load( wxGDIImage* WXUNUSED(pImage) inline virtual bool Load( wxGDIImage* WXUNUSED(pImage)
,const wxString& WXUNUSED(rName) ,const wxString& WXUNUSED(rName)
,WXHANDLE WXUNUSED(hPs) ,WXHANDLE WXUNUSED(hPs)
,long WXUNUSED(lFlags) ,wxBitmapType WXUNUSED(lFlags)
,int WXUNUSED(nDesiredWidth) ,int WXUNUSED(nDesiredWidth)
,int WXUNUSED(nDesiredHeight) ,int WXUNUSED(nDesiredHeight)
) )

26
include/wx/os2/gdiimage.h
View File

@ -88,7 +88,7 @@ public:
wxGDIImageHandler() { m_lType = wxBITMAP_TYPE_INVALID; } wxGDIImageHandler() { m_lType = wxBITMAP_TYPE_INVALID; }
wxGDIImageHandler( const wxString& rName wxGDIImageHandler( const wxString& rName
,const wxString& rExt ,const wxString& rExt
,long lType ,wxBitmapType lType
) )
: m_sName(rName) : m_sName(rName)
, m_sExtension(rExt) , m_sExtension(rExt)
@ -99,16 +99,16 @@ public:
// accessors // accessors
void SetName(const wxString& rName) { m_sName = rName; } void SetName(const wxString& rName) { m_sName = rName; }
void SetExtension(const wxString& rExt) { m_sExtension = rExt; } void SetExtension(const wxString& rExt) { m_sExtension = rExt; }
void SetType(long lType) { m_lType = lType; } void SetType(wxBitmapType lType) { m_lType = lType; }
wxString GetName() const { return m_sName; } wxString GetName() const { return m_sName; }
wxString GetExtension() const { return m_sExtension; } wxString GetExtension() const { return m_sExtension; }
long GetType() const { return m_lType; } wxBitmapType GetType() const { return m_lType; }
// real handler operations: to implement in derived classes // real handler operations: to implement in derived classes
virtual bool Create( wxGDIImage* pImage virtual bool Create( wxGDIImage* pImage
,const void* pData ,const void* pData
,long lFlags ,wxBitmapType lFlags
,int nWidth ,int nWidth
,int nHeight ,int nHeight
,int nDepth = 1 ,int nDepth = 1
@ -116,25 +116,25 @@ public:
virtual bool Load( wxGDIImage* pImage virtual bool Load( wxGDIImage* pImage
,const wxString& rName ,const wxString& rName
,HPS hPs ,HPS hPs
,long lFlags ,wxBitmapType lFlags
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight
) = 0; ) = 0;
virtual bool Load( wxGDIImage* pImage virtual bool Load( wxGDIImage* pImage
,int nId ,int nId
,long lFlags ,wxBitmapType lFlags
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight
) = 0; ) = 0;
virtual bool Save( wxGDIImage* pImage virtual bool Save( const wxGDIImage* pImage
,const wxString& rName ,const wxString& rName
,int lType ,wxBitmapType lType
) = 0; ) const = 0;
protected: protected:
wxString m_sName; wxString m_sName;
wxString m_sExtension; wxString m_sExtension;
long m_lType; wxBitmapType m_lType;
}; // end of wxGDIImageHandler }; // end of wxGDIImageHandler
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -154,8 +154,8 @@ public:
static bool RemoveHandler(const wxString& rName); static bool RemoveHandler(const wxString& rName);
static wxGDIImageHandler* FindHandler(const wxString& rName); static wxGDIImageHandler* FindHandler(const wxString& rName);
static wxGDIImageHandler* FindHandler(const wxString& rExtension, long lType); static wxGDIImageHandler* FindHandler(const wxString& rExtension, wxBitmapType lType);
static wxGDIImageHandler* FindHandler(long lType); static wxGDIImageHandler* FindHandler(wxBitmapType lType);
static void InitStandardHandlers(); static void InitStandardHandlers();
static void CleanUpHandlers(); static void CleanUpHandlers();

4
include/wx/os2/icon.h
View File

@ -49,7 +49,7 @@ public:
wxIcon(char** ppData) { CreateIconFromXpm(wx_const_cast(const char* const*, ppData)); } wxIcon(char** ppData) { CreateIconFromXpm(wx_const_cast(const char* const*, ppData)); }
#endif #endif
wxIcon( const wxString& rName wxIcon( const wxString& rName
,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE ,wxBitmapType lFlags = wxBITMAP_TYPE_ICO_RESOURCE
,int nDesiredWidth = -1 ,int nDesiredWidth = -1
,int nDesiredHeight = -1 ,int nDesiredHeight = -1
); );
@ -61,7 +61,7 @@ public:
virtual ~wxIcon(); virtual ~wxIcon();
bool LoadFile( const wxString& rName bool LoadFile( const wxString& rName
,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE ,wxBitmapType lFlags = wxBITMAP_TYPE_ICO_RESOURCE
,int nDesiredWidth = -1 ,int nDesiredWidth = -1
,int nDesiredHeight = -1 ,int nDesiredHeight = -1
); );

21
src/os2/bitmap.cpp
View File

@ -290,7 +290,7 @@ wxBitmap::wxBitmap(
wxBitmap::wxBitmap( wxBitmap::wxBitmap(
const void* pData const void* pData
, long lType , wxBitmapType lType
, int nWidth , int nWidth
, int nHeight , int nHeight
, int nDepth , int nDepth
@ -308,12 +308,12 @@ wxBitmap::wxBitmap(
wxBitmap::wxBitmap( wxBitmap::wxBitmap(
int nId int nId
, long lType , wxBitmapType lType
) )
{ {
Init(); Init();
LoadFile( nId LoadFile( nId
,(int)lType ,lType
); );
SetId(nId); SetId(nId);
} // end of wxBitmap::wxBitmap } // end of wxBitmap::wxBitmap
@ -398,7 +398,7 @@ bool wxBitmap::Create(
return Ok(); return Ok();
} // end of wxBitmap::Create } // end of wxBitmap::Create
bool wxBitmap::LoadFile(const wxString& filename, long type) bool wxBitmap::LoadFile(const wxString& filename, wxBitmapType type)
{ {
UnRef(); UnRef();
@ -428,7 +428,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type)
bool wxBitmap::LoadFile( bool wxBitmap::LoadFile(
int nId int nId
, long lType , wxBitmapType lType
) )
{ {
UnRef(); UnRef();
@ -456,7 +456,7 @@ bool wxBitmap::LoadFile(
bool wxBitmap::Create( bool wxBitmap::Create(
const void* pData const void* pData
, long lType , wxBitmapType lType
, int nWidth , int nWidth
, int nHeight , int nHeight
, int nDepth , int nDepth
@ -488,7 +488,7 @@ bool wxBitmap::Create(
bool wxBitmap::SaveFile( bool wxBitmap::SaveFile(
const wxString& rFilename const wxString& rFilename
, int lType , wxBitmapType lType
, const wxPalette* pPalette , const wxPalette* pPalette
) )
{ {
@ -1456,7 +1456,7 @@ bool wxMask::Create(
bool wxBitmapHandler::Create( wxGDIImage* pImage, bool wxBitmapHandler::Create( wxGDIImage* pImage,
const void* pData, const void* pData,
wxBitmapType WXUNUSED(lFlags), wxBitmapType lType,
int nWidth, int nWidth,
int nHeight, int nHeight,
int nDepth) int nDepth)
@ -1467,6 +1467,7 @@ bool wxBitmapHandler::Create( wxGDIImage* pImage,
return(pBitmap ? Create( pBitmap return(pBitmap ? Create( pBitmap
,pData ,pData
,lType
,nWidth ,nWidth
,nHeight ,nHeight
,nDepth ,nDepth
@ -1494,9 +1495,9 @@ bool wxBitmapHandler::Load(
} }
bool wxBitmapHandler::Save( bool wxBitmapHandler::Save(
wxGDIImage* pImage const wxGDIImage* pImage
, const wxString& rName , const wxString& rName
, int lType , wxBitmapType lType
) const ) const
{ {
wxBitmap* pBitmap = wxDynamicCast( pImage wxBitmap* pBitmap = wxDynamicCast( pImage

44
src/os2/gdiimage.cpp
View File

@ -50,20 +50,20 @@ public:
virtual bool LoadFile( wxBitmap* pBitmap virtual bool LoadFile( wxBitmap* pBitmap
,const wxString& rName ,const wxString& rName
,HPS hPs ,HPS hPs
,long lFlags ,wxBitmapType lFlags
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight
); );
virtual bool SaveFile( wxBitmap* pBitmap virtual bool SaveFile( wxBitmap* pBitmap
,const wxString& rName ,const wxString& rName
,int lType ,wxBitmapType lType
,const wxPalette* pPalette = NULL ,const wxPalette* pPalette = NULL
); );
private: private:
inline virtual bool LoadFile( wxBitmap* pBitmap inline virtual bool LoadFile( wxBitmap* pBitmap
,int nId ,int nId
,long lFlags ,wxBitmapType lFlags
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight
) )
@ -89,7 +89,7 @@ public:
virtual bool LoadFile( wxBitmap* pBitmap virtual bool LoadFile( wxBitmap* pBitmap
,int nId ,int nId
,long lFlags ,wxBitmapType lFlags
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight
); );
@ -103,7 +103,7 @@ class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler
public: public:
wxIconHandler( const wxString& rName wxIconHandler( const wxString& rName
,const wxString& rExt ,const wxString& rExt
,long lType ,wxBitmapType lType
) : wxGDIImageHandler( rName ) : wxGDIImageHandler( rName
,rExt ,rExt
,lType ,lType
@ -114,7 +114,7 @@ public:
// creating and saving icons is not supported // creating and saving icons is not supported
virtual bool Create( wxGDIImage* WXUNUSED(pImage) virtual bool Create( wxGDIImage* WXUNUSED(pImage)
,const void* WXUNUSED(pData) ,const void* WXUNUSED(pData)
,long WXUNUSED(lFlags) ,wxBitmapType WXUNUSED(lFlags)
,int WXUNUSED(nWidth) ,int WXUNUSED(nWidth)
,int WXUNUSED(nHeight) ,int WXUNUSED(nHeight)
,int WXUNUSED(nDepth) = 1 ,int WXUNUSED(nDepth) = 1
@ -123,17 +123,17 @@ public:
return false; return false;
} }
virtual bool Save( wxGDIImage* WXUNUSED(pImage) virtual bool Save( const wxGDIImage* WXUNUSED(pImage)
,const wxString& WXUNUSED(rName) ,const wxString& WXUNUSED(rName)
,int WXUNUSED(nType) ,wxBitmapType WXUNUSED(nType)
) ) const
{ {
return false; return false;
} }
virtual bool Load( wxGDIImage* pImage virtual bool Load( wxGDIImage* pImage
,const wxString& rName ,const wxString& rName
,HPS hPs ,HPS hPs
,long lFlags ,wxBitmapType lFlags
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight
) )
@ -154,14 +154,14 @@ protected:
virtual bool LoadIcon( wxIcon* pIcon virtual bool LoadIcon( wxIcon* pIcon
,const wxString& rName ,const wxString& rName
,HPS hPs ,HPS hPs
,long lFlags ,wxBitmapType lFlags
,int nDesiredWidth = -1 ,int nDesiredWidth = -1
,int nDesiredHeight = -1 ,int nDesiredHeight = -1
) = 0; ) = 0;
private: private:
inline virtual bool Load( wxGDIImage* WXUNUSED(pImage), inline virtual bool Load( wxGDIImage* WXUNUSED(pImage),
int WXUNUSED(nId), int WXUNUSED(nId),
long WXUNUSED(lFlags), wxBitmapType WXUNUSED(lFlags),
int WXUNUSED(nDesiredWidth), int WXUNUSED(nDesiredWidth),
int WXUNUSED(nDesiredHeight) ) int WXUNUSED(nDesiredHeight) )
{ {
@ -181,7 +181,7 @@ public:
virtual bool LoadIcon( wxIcon * pIcon virtual bool LoadIcon( wxIcon * pIcon
,const wxString& rName ,const wxString& rName
,HPS hPs ,HPS hPs
,long lFlags ,wxBitmapType lFlags
,int nDesiredWidth = -1 ,int nDesiredWidth = -1
,int nDesiredHeight = -1 ,int nDesiredHeight = -1
); );
@ -202,7 +202,7 @@ public:
virtual bool LoadIcon( wxIcon* pIcon virtual bool LoadIcon( wxIcon* pIcon
,const wxString& rName ,const wxString& rName
,HPS hPs ,HPS hPs
,long lFlags ,wxBitmapType lFlags
,int nDesiredWidth = -1 ,int nDesiredWidth = -1
,int nDesiredHeight = -1 ,int nDesiredHeight = -1
); );
@ -292,7 +292,7 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
wxGDIImageHandler* wxGDIImage::FindHandler( wxGDIImageHandler* wxGDIImage::FindHandler(
const wxString& rExtension const wxString& rExtension
, long lType , wxBitmapType lType
) )
{ {
wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst(); wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
@ -311,7 +311,7 @@ wxGDIImageHandler* wxGDIImage::FindHandler(
} }
wxGDIImageHandler* wxGDIImage::FindHandler( wxGDIImageHandler* wxGDIImage::FindHandler(
long lType wxBitmapType lType
) )
{ {
wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst(); wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
@ -356,7 +356,7 @@ void wxGDIImage::InitStandardHandlers()
bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap, bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
int nId, int nId,
long WXUNUSED(lFlags), wxBitmapType WXUNUSED(lFlags),
int WXUNUSED(nDesiredWidth), int WXUNUSED(nDesiredWidth),
int WXUNUSED(nDesiredHeight) ) int WXUNUSED(nDesiredHeight) )
{ {
@ -391,7 +391,7 @@ bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap, bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap,
const wxString& WXUNUSED(rName), const wxString& WXUNUSED(rName),
HPS WXUNUSED(hPs), HPS WXUNUSED(hPs),
long WXUNUSED(lFlags), wxBitmapType WXUNUSED(lFlags),
int WXUNUSED(nDesiredWidth), int WXUNUSED(nDesiredWidth),
int WXUNUSED(nDesiredHeight) ) int WXUNUSED(nDesiredHeight) )
{ {
@ -419,7 +419,7 @@ bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap,
bool wxBMPFileHandler::SaveFile( wxBitmap* pBitmap, bool wxBMPFileHandler::SaveFile( wxBitmap* pBitmap,
const wxString& WXUNUSED(rName), const wxString& WXUNUSED(rName),
int WXUNUSED(nType), wxBitmapType WXUNUSED(nType),
const wxPalette* pPal ) const wxPalette* pPal )
{ {
#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2 #if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2
@ -446,7 +446,7 @@ bool wxBMPFileHandler::SaveFile( wxBitmap* pBitmap,
bool wxICOFileHandler::LoadIcon( wxIcon* pIcon, bool wxICOFileHandler::LoadIcon( wxIcon* pIcon,
const wxString& WXUNUSED(rName), const wxString& WXUNUSED(rName),
HPS WXUNUSED(hPs), HPS WXUNUSED(hPs),
long WXUNUSED(lFlags), wxBitmapType WXUNUSED(lFlags),
int WXUNUSED(nDesiredWidth), int WXUNUSED(nDesiredWidth),
int WXUNUSED(nDesiredHeight) ) int WXUNUSED(nDesiredHeight) )
{ {
@ -463,7 +463,7 @@ bool wxICOFileHandler::LoadIcon( wxIcon* pIcon,
bool wxICOResourceHandler::LoadIcon( wxIcon* pIcon, bool wxICOResourceHandler::LoadIcon( wxIcon* pIcon,
const wxString& rName, const wxString& rName,
HPS WXUNUSED(hPs), HPS WXUNUSED(hPs),
long WXUNUSED(lFlags), wxBitmapType WXUNUSED(lFlags),
int WXUNUSED(nDesiredWidth), int WXUNUSED(nDesiredWidth),
int WXUNUSED(nDesiredHeight) ) int WXUNUSED(nDesiredHeight) )
{ {

4
src/os2/icon.cpp
View File

@ -61,7 +61,7 @@ wxIcon::wxIcon( const char WXUNUSED(bits)[],
} }
wxIcon::wxIcon( const wxString& rIconFile, wxIcon::wxIcon( const wxString& rIconFile,
long lFlags, wxBitmapType lFlags,
int nDesiredWidth, int nDesiredWidth,
int nDesiredHeight ) int nDesiredHeight )
:m_bIsXpm(false) :m_bIsXpm(false)
@ -257,7 +257,7 @@ void wxIcon::CopyFromBitmap( const wxBitmap& rBmp )
} // end of wxIcon::CopyFromBitmap } // end of wxIcon::CopyFromBitmap
bool wxIcon::LoadFile( const wxString& rFilename, bool wxIcon::LoadFile( const wxString& rFilename,
long lType, wxBitmapType lType,
int nDesiredWidth, int nDesiredWidth,
int nDesiredHeight ) int nDesiredHeight )
{ {