virtual bool LoadFile( wxBitmap* pBitmap
,const wxString& rName
,HPS hPs
- ,long lFlags
+ ,wxBitmapType lFlags
,int nDesiredWidth
,int nDesiredHeight
);
virtual bool SaveFile( wxBitmap* pBitmap
,const wxString& rName
- ,int lType
+ ,wxBitmapType lType
,const wxPalette* pPalette = NULL
);
private:
inline virtual bool LoadFile( wxBitmap* pBitmap
,int nId
- ,long lFlags
+ ,wxBitmapType lFlags
,int nDesiredWidth
,int nDesiredHeight
)
virtual bool LoadFile( wxBitmap* pBitmap
,int nId
- ,long lFlags
+ ,wxBitmapType lFlags
,int nDesiredWidth
,int nDesiredHeight
);
public:
wxIconHandler( const wxString& rName
,const wxString& rExt
- ,long lType
+ ,wxBitmapType lType
) : wxGDIImageHandler( rName
,rExt
,lType
// creating and saving icons is not supported
virtual bool Create( wxGDIImage* WXUNUSED(pImage)
,const void* WXUNUSED(pData)
- ,long WXUNUSED(lFlags)
+ ,wxBitmapType WXUNUSED(lFlags)
,int WXUNUSED(nWidth)
,int WXUNUSED(nHeight)
,int WXUNUSED(nDepth) = 1
return false;
}
- virtual bool Save( wxGDIImage* WXUNUSED(pImage)
- ,const wxString& WXUNUSED(rName)
- ,int WXUNUSED(nType)
- )
+ virtual bool Save( const wxGDIImage* WXUNUSED(pImage)
+ ,const wxString& WXUNUSED(rName)
+ ,wxBitmapType WXUNUSED(nType)
+ ) const
{
return false;
}
virtual bool Load( wxGDIImage* pImage
,const wxString& rName
,HPS hPs
- ,long lFlags
+ ,wxBitmapType lFlags
,int nDesiredWidth
,int nDesiredHeight
)
virtual bool LoadIcon( wxIcon* pIcon
,const wxString& rName
,HPS hPs
- ,long lFlags
+ ,wxBitmapType lFlags
,int nDesiredWidth = -1
,int nDesiredHeight = -1
) = 0;
private:
inline virtual bool Load( wxGDIImage* WXUNUSED(pImage),
int WXUNUSED(nId),
- long WXUNUSED(lFlags),
+ wxBitmapType WXUNUSED(lFlags),
int WXUNUSED(nDesiredWidth),
int WXUNUSED(nDesiredHeight) )
{
virtual bool LoadIcon( wxIcon * pIcon
,const wxString& rName
,HPS hPs
- ,long lFlags
+ ,wxBitmapType lFlags
,int nDesiredWidth = -1
,int nDesiredHeight = -1
);
virtual bool LoadIcon( wxIcon* pIcon
,const wxString& rName
,HPS hPs
- ,long lFlags
+ ,wxBitmapType lFlags
,int nDesiredWidth = -1
,int nDesiredHeight = -1
);
return pHandler;
pNode = pNode->GetNext();
}
- return((wxGDIImageHandler*)NULL);
+ return(NULL);
}
wxGDIImageHandler* wxGDIImage::FindHandler(
const wxString& rExtension
-, long lType
+, wxBitmapType lType
)
{
wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
{
wxGDIImageHandler* pHandler = pNode->GetData();
- if ( (pHandler->GetExtension() = rExtension) &&
+ if ( (pHandler->GetExtension() == rExtension) &&
(lType == -1 || pHandler->GetType() == lType) )
{
return pHandler;
}
pNode = pNode->GetNext();
}
- return((wxGDIImageHandler*)NULL);
+ return(NULL);
}
wxGDIImageHandler* wxGDIImage::FindHandler(
- long lType
+ wxBitmapType lType
)
{
wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
return pHandler;
pNode = pNode->GetNext();
}
- return((wxGDIImageHandler*)NULL);
+ return(NULL);
}
void wxGDIImage::CleanUpHandlers()
bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
int nId,
- long WXUNUSED(lFlags),
+ wxBitmapType WXUNUSED(lFlags),
int WXUNUSED(nDesiredWidth),
int WXUNUSED(nDesiredHeight) )
{
bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap,
const wxString& WXUNUSED(rName),
HPS WXUNUSED(hPs),
- long WXUNUSED(lFlags),
+ wxBitmapType WXUNUSED(lFlags),
int WXUNUSED(nDesiredWidth),
int WXUNUSED(nDesiredHeight) )
{
bool wxBMPFileHandler::SaveFile( wxBitmap* pBitmap,
const wxString& WXUNUSED(rName),
- int WXUNUSED(nType),
+ wxBitmapType WXUNUSED(nType),
const wxPalette* pPal )
{
#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2
bool wxICOFileHandler::LoadIcon( wxIcon* pIcon,
const wxString& WXUNUSED(rName),
HPS WXUNUSED(hPs),
- long WXUNUSED(lFlags),
+ wxBitmapType WXUNUSED(lFlags),
int WXUNUSED(nDesiredWidth),
int WXUNUSED(nDesiredHeight) )
{
bool wxICOResourceHandler::LoadIcon( wxIcon* pIcon,
const wxString& rName,
HPS WXUNUSED(hPs),
- long WXUNUSED(lFlags),
+ wxBitmapType WXUNUSED(lFlags),
int WXUNUSED(nDesiredWidth),
int WXUNUSED(nDesiredHeight) )
{
HPOINTER hIcon;
- hIcon = ::WinLoadFileIcon( (PSZ)rName.c_str()
+ hIcon = ::WinLoadFileIcon( rName.c_str()
,TRUE // load for private use
);