///////////////////////////////////////////////////////////////////////////////
-// Name: msw/gdiimage.cpp
+// Name: src/os2/gdiimage.cpp
// Purpose: wxGDIImage implementation
// Author: Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "gdiimage.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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
// creating and saving icons is not supported
virtual bool Create( wxGDIImage* WXUNUSED(pImage)
- ,void* WXUNUSED(pData)
+ ,const void* WXUNUSED(pData)
,long WXUNUSED(lFlags)
,int WXUNUSED(nWidth)
,int WXUNUSED(nHeight)
,int WXUNUSED(nDepth) = 1
)
{
- return(FALSE);
+ return false;
}
virtual bool Save( wxGDIImage* WXUNUSED(pImage)
,int WXUNUSED(nType)
)
{
- return(FALSE);
+ return false;
}
virtual bool Load( wxGDIImage* pImage
,const wxString& rName
)
{
wxIcon* pIcon = wxDynamicCast(pImage, wxIcon);
- wxCHECK_MSG(pIcon, FALSE, _T("wxIconHandler only works with icons"));
+ wxCHECK_MSG(pIcon, false, _T("wxIconHandler only works with icons"));
return LoadIcon( pIcon
,rName
// wxWin macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARIES
- IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
- IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
- IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
- IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
// ============================================================================
// implementation
return true;
}
-WXHANDLE wxGDIImage::GetResourceHandle()
+WXHANDLE wxGDIImage::GetResourceHandle() const
{
return GetHandle();
}
{
wxGDIImageHandler* pHandler = pNode->GetData();
- if ( (pHandler->GetExtension() = rExtension) &&
+ if ( (pHandler->GetExtension() == rExtension) &&
(lType == -1 || pHandler->GetType() == lType) )
{
return pHandler;
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
int 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)
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;
{
HPOINTER hIcon;
- hIcon = ::WinLoadFileIcon( (PSZ)rName.c_str()
+ hIcon = ::WinLoadFileIcon( rName.c_str()
,TRUE // load for private use
);