X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..3225a4b8b8656f25dac6cb20684a3c2c273cf796:/src/os2/gdiimage.cpp diff --git a/src/os2/gdiimage.cpp b/src/os2/gdiimage.cpp index b4dc31cd00..405d2221f3 100644 --- a/src/os2/gdiimage.cpp +++ b/src/os2/gdiimage.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/gdiimage.cpp +// Name: src/os2/gdiimage.cpp // Purpose: wxGDIImage implementation // Author: Vadim Zeitlin // Modified by: @@ -23,14 +23,14 @@ #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/app.h" #endif // WX_PRECOMP #include "wx/os2/private.h" -#include "wx/app.h" #include "wx/os2/gdiimage.h" #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxGDIImageHandlerList); +WX_DEFINE_LIST(wxGDIImageHandlerList) // ---------------------------------------------------------------------------- // private classes @@ -42,7 +42,7 @@ WX_DEFINE_LIST(wxGDIImageHandlerList); class WXDLLEXPORT wxBMPFileHandler : public wxBitmapHandler { public: - wxBMPFileHandler() : wxBitmapHandler(_T("Windows bitmap file"), _T("bmp"), + wxBMPFileHandler() : wxBitmapHandler(wxT("Windows bitmap file"), wxT("bmp"), wxBITMAP_TYPE_BMP) { } @@ -50,20 +50,20 @@ public: 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 ) @@ -81,7 +81,7 @@ private: class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler { public: - wxBMPResourceHandler() : wxBitmapHandler(_T("Windows bitmap resource"), + wxBMPResourceHandler() : wxBitmapHandler(wxT("Windows bitmap resource"), wxEmptyString, wxBITMAP_TYPE_BMP_RESOURCE) { @@ -89,7 +89,7 @@ public: virtual bool LoadFile( wxBitmap* pBitmap ,int nId - ,long lFlags + ,wxBitmapType lFlags ,int nDesiredWidth ,int nDesiredHeight ); @@ -103,7 +103,7 @@ class WXDLLEXPORT wxIconHandler : public wxGDIImageHandler public: wxIconHandler( const wxString& rName ,const wxString& rExt - ,long lType + ,wxBitmapType lType ) : wxGDIImageHandler( rName ,rExt ,lType @@ -113,33 +113,33 @@ public: // creating and saving icons is not supported virtual bool Create( wxGDIImage* WXUNUSED(pImage) - ,void* WXUNUSED(pData) - ,long WXUNUSED(lFlags) + ,const void* WXUNUSED(pData) + ,wxBitmapType WXUNUSED(lFlags) ,int WXUNUSED(nWidth) ,int WXUNUSED(nHeight) ,int WXUNUSED(nDepth) = 1 ) { - return(FALSE); + 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); + return false; } virtual bool Load( wxGDIImage* pImage ,const wxString& rName ,HPS hPs - ,long lFlags + ,wxBitmapType lFlags ,int nDesiredWidth ,int nDesiredHeight ) { wxIcon* pIcon = wxDynamicCast(pImage, wxIcon); - wxCHECK_MSG(pIcon, FALSE, _T("wxIconHandler only works with icons")); + wxCHECK_MSG(pIcon, false, wxT("wxIconHandler only works with icons")); return LoadIcon( pIcon ,rName @@ -154,14 +154,14 @@ protected: 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) ) { @@ -172,8 +172,8 @@ private: class WXDLLEXPORT wxICOFileHandler : public wxIconHandler { public: - wxICOFileHandler() : wxIconHandler(_T("ICO icon file"), - _T("ico"), + wxICOFileHandler() : wxIconHandler(wxT("ICO icon file"), + wxT("ico"), wxBITMAP_TYPE_ICO) { } @@ -181,7 +181,7 @@ public: virtual bool LoadIcon( wxIcon * pIcon ,const wxString& rName ,HPS hPs - ,long lFlags + ,wxBitmapType lFlags ,int nDesiredWidth = -1 ,int nDesiredHeight = -1 ); @@ -193,8 +193,8 @@ private: class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler { public: - wxICOResourceHandler() : wxIconHandler(_T("ICO resource"), - _T("ico"), + wxICOResourceHandler() : wxIconHandler(wxT("ICO resource"), + wxT("ico"), wxBITMAP_TYPE_ICO_RESOURCE) { } @@ -202,7 +202,7 @@ public: virtual bool LoadIcon( wxIcon* pIcon ,const wxString& rName ,HPS hPs - ,long lFlags + ,wxBitmapType lFlags ,int nDesiredWidth = -1 ,int nDesiredHeight = -1 ); @@ -241,7 +241,7 @@ bool wxGDIImage::FreeResource( bool WXUNUSED(bForce) ) return true; } -WXHANDLE wxGDIImage::GetResourceHandle() +WXHANDLE wxGDIImage::GetResourceHandle() const { return GetHandle(); } @@ -287,12 +287,12 @@ wxGDIImageHandler* wxGDIImage::FindHandler( 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(); @@ -300,18 +300,18 @@ wxGDIImageHandler* wxGDIImage::FindHandler( { 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(); @@ -324,7 +324,7 @@ wxGDIImageHandler* wxGDIImage::FindHandler( return pHandler; pNode = pNode->GetNext(); } - return((wxGDIImageHandler*)NULL); + return(NULL); } void wxGDIImage::CleanUpHandlers() @@ -356,7 +356,7 @@ void wxGDIImage::InitStandardHandlers() bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap, int nId, - long WXUNUSED(lFlags), + wxBitmapType WXUNUSED(lFlags), int WXUNUSED(nDesiredWidth), int WXUNUSED(nDesiredHeight) ) { @@ -376,7 +376,7 @@ bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap, wxBitmapRefData* pData = pBitmap->GetBitmapData(); - if ( pBitmap->Ok() ) + if ( pBitmap->IsOk() ) { BITMAPINFOHEADER vBmph; @@ -385,17 +385,17 @@ bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap, pData->m_nHeight = vBmph.cy; pData->m_nDepth = vBmph.cBitCount; } - return(pBitmap->Ok()); + return(pBitmap->IsOk()); } // end of wxBMPResourceHandler::LoadFile bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap, const wxString& WXUNUSED(rName), HPS WXUNUSED(hPs), - long WXUNUSED(lFlags), + wxBitmapType WXUNUSED(lFlags), int WXUNUSED(nDesiredWidth), int WXUNUSED(nDesiredHeight) ) { -#if wxUSE_IMAGE_LOADING_IN_OS2 +#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2 wxPalette* pPalette = NULL; bool bSuccess = false; /* wxLoadIntoBitmap( WXSTRINGCAST rName @@ -419,10 +419,10 @@ bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap, bool wxBMPFileHandler::SaveFile( wxBitmap* pBitmap, const wxString& WXUNUSED(rName), - int WXUNUSED(nType), + wxBitmapType WXUNUSED(nType), const wxPalette* pPal ) { -#if wxUSE_IMAGE_LOADING_IN_OS2 +#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2 wxPalette* pActualPalette = (wxPalette *)pPal; if (!pActualPalette) @@ -446,11 +446,11 @@ bool wxBMPFileHandler::SaveFile( wxBitmap* pBitmap, bool wxICOFileHandler::LoadIcon( wxIcon* pIcon, const wxString& WXUNUSED(rName), HPS WXUNUSED(hPs), - long WXUNUSED(lFlags), + wxBitmapType WXUNUSED(lFlags), int WXUNUSED(nDesiredWidth), int WXUNUSED(nDesiredHeight) ) { -#if wxUSE_RESOURCE_LOADING_IN_OS2 +#if defined(wxUSE_RESOURCE_LOADING_IN_OS2) && wxUSE_RESOURCE_LOADING_IN_OS2 pIcon->UnRef(); return false; @@ -463,13 +463,13 @@ bool wxICOFileHandler::LoadIcon( wxIcon* pIcon, 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 ); @@ -477,5 +477,5 @@ bool wxICOResourceHandler::LoadIcon( wxIcon* pIcon, pIcon->SetHICON((WXHICON)hIcon); - return pIcon->Ok(); + return pIcon->IsOk(); } // end of wxICOResourceHandler::LoadIcon