reorganized wxBitmap/wxBitmapHandler classes to use wxBitmapType instead of "long" where possible; made them const-correct; introduce wxBITMAP_SCREEN_DEPTH instead of -1 for clearness (specially in the docs); remove wxBitmapHandler empty stubs and rename wxBitmapHandlerBase as wxBitmapHandler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-25 20:31:48 +00:00
parent 0685aa9eb6
commit e86f2cc84a
22 changed files with 184 additions and 236 deletions

View File

@@ -39,7 +39,6 @@
IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
// ============================================================================
// implementation
@@ -1457,7 +1456,7 @@ bool wxMask::Create(
bool wxBitmapHandler::Create( wxGDIImage* pImage,
const void* pData,
long WXUNUSED(lFlags),
wxBitmapType WXUNUSED(lFlags),
int nWidth,
int nHeight,
int nDepth)
@@ -1477,7 +1476,7 @@ bool wxBitmapHandler::Create( wxGDIImage* pImage,
bool wxBitmapHandler::Load(
wxGDIImage* pImage
, int nId
, long lFlags
, wxBitmapType lFlags
, int nWidth
, int nHeight
)
@@ -1498,7 +1497,7 @@ bool wxBitmapHandler::Save(
wxGDIImage* pImage
, const wxString& rName
, int lType
)
) const
{
wxBitmap* pBitmap = wxDynamicCast( pImage
,wxBitmap
@@ -1513,7 +1512,7 @@ bool wxBitmapHandler::Save(
bool wxBitmapHandler::Create(
wxBitmap* WXUNUSED(pBitmap)
, const void* WXUNUSED(pData)
, long WXUNUSED(lType)
, wxBitmapType WXUNUSED(lType)
, int WXUNUSED(nWidth)
, int WXUNUSED(nHeight)
, int WXUNUSED(nDepth)
@@ -1525,7 +1524,7 @@ bool wxBitmapHandler::Create(
bool wxBitmapHandler::LoadFile(
wxBitmap* WXUNUSED(pBitmap)
, int WXUNUSED(nId)
, long WXUNUSED(lType)
, wxBitmapType WXUNUSED(lType)
, int WXUNUSED(nDesiredWidth)
, int WXUNUSED(nDesiredHeight)
)
@@ -1536,7 +1535,7 @@ bool wxBitmapHandler::LoadFile(
bool wxBitmapHandler::LoadFile(
wxBitmap* WXUNUSED(pBitmap)
, const wxString& WXUNUSED(rName)
, long WXUNUSED(lType)
, wxBitmapType WXUNUSED(lType)
, int WXUNUSED(nDesiredWidth)
, int WXUNUSED(nDesiredHeight)
)
@@ -1547,9 +1546,9 @@ bool wxBitmapHandler::LoadFile(
bool wxBitmapHandler::SaveFile(
wxBitmap* WXUNUSED(pBitmap)
, const wxString& WXUNUSED(rName)
, int WXUNUSED(nType)
, wxBitmapType WXUNUSED(nType)
, const wxPalette* WXUNUSED(pPalette)
)
) const
{
return false;
}