Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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
Download Patch File Download Diff File Expand all files Collapse all files

21
src/os2/bitmap.cpp
View File

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