///////////////////////////////////////////////////////////////////////////////
-// Name: msw/gdiimage.cpp
+// Name: src/os2/gdiimage.cpp
// Purpose: wxGDIImage implementation
// Author: Vadim Zeitlin
// Modified by:
// Created: 20.11.99
-// RCS-ID: $Id$
// Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
#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)
+
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------
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)
{
}
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
+ ,wxBitmapType lFlags
+ ,int nDesiredWidth
+ ,int nDesiredHeight
+ )
+ {
+ return wxBitmapHandler::LoadFile( pBitmap
+ ,nId
+ ,lFlags
+ ,nDesiredWidth
+ ,nDesiredHeight
+ );
+ }
DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
};
class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
{
public:
- wxBMPResourceHandler() : wxBitmapHandler(_T("Windows bitmap resource"),
+ wxBMPResourceHandler() : wxBitmapHandler(wxT("Windows bitmap resource"),
wxEmptyString,
wxBITMAP_TYPE_BMP_RESOURCE)
{
}
virtual bool LoadFile( wxBitmap* pBitmap
- ,const wxString& rName
- ,HPS hPs
- ,long lFlags
+ ,int nId
+ ,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)
- ,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
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),
+ wxBitmapType WXUNUSED(lFlags),
+ int WXUNUSED(nDesiredWidth),
+ int WXUNUSED(nDesiredHeight) )
+ {
+ return false;
+ }
};
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)
{
}
virtual bool LoadIcon( wxIcon * pIcon
,const wxString& rName
,HPS hPs
- ,long lFlags
+ ,wxBitmapType lFlags
,int nDesiredWidth = -1
,int nDesiredHeight = -1
);
class WXDLLEXPORT wxICOResourceHandler: public wxIconHandler
{
public:
- wxICOResourceHandler() : wxIconHandler(_T("ICO resource"),
- _T("ico"),
+ wxICOResourceHandler() : wxIconHandler(wxT("ICO resource"),
+ wxT("ico"),
wxBITMAP_TYPE_ICO_RESOURCE)
{
}
virtual bool LoadIcon( wxIcon* pIcon
,const wxString& rName
,HPS hPs
- ,long lFlags
+ ,wxBitmapType lFlags
,int nDesiredWidth = -1
,int nDesiredHeight = -1
);
// wxWin macros
// ----------------------------------------------------------------------------
-#if !USE_SHARED_LIBRARIES
- IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
- IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
- IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxGDIImageHandler)
- IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxGDIImageHandler)
-#endif
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-static wxSize GetHiconSize(WXHICON hicon);
+IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
// ============================================================================
// implementation
// ============================================================================
-wxList wxGDIImage::ms_handlers;
+wxGDIImageHandlerList wxGDIImage::ms_handlers;
// ----------------------------------------------------------------------------
// wxGDIImage functions forwarded to wxGDIImageRefData
// ----------------------------------------------------------------------------
-bool wxGDIImage::FreeResource(
- bool WXUNUSED(bForce)
-)
+bool wxGDIImage::FreeResource( bool WXUNUSED(bForce) )
{
if ( !IsNull() )
{
GetGDIImageData()->m_hHandle = 0;
}
- return(TRUE);
+ return true;
}
-WXHANDLE wxGDIImage::GetResourceHandle()
+WXHANDLE wxGDIImage::GetResourceHandle() const
{
return GetHandle();
}
// wxGDIImage handler stuff
// ----------------------------------------------------------------------------
-void wxGDIImage::AddHandler(
- wxGDIImageHandler* pHandler
-)
+void wxGDIImage::AddHandler( wxGDIImageHandler* pHandler )
{
ms_handlers.Append(pHandler);
}
-void wxGDIImage::InsertHandler(
- wxGDIImageHandler* pHandler
-)
+void wxGDIImage::InsertHandler( wxGDIImageHandler* pHandler )
{
ms_handlers.Insert(pHandler);
}
-bool wxGDIImage::RemoveHandler(
- const wxString& rName
-)
+bool wxGDIImage::RemoveHandler( const wxString& rName )
{
wxGDIImageHandler* pHandler = FindHandler(rName);
if (pHandler)
{
ms_handlers.DeleteObject(pHandler);
- return(TRUE);
+ return true;
}
else
- return(FALSE);
+ return false;
}
wxGDIImageHandler* wxGDIImage::FindHandler(
const wxString& rName
)
{
- wxNode* pNode = ms_handlers.First();
+ wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
- while (pNode)
+ while ( pNode )
{
- wxGDIImageHandler* pHandler = (wxGDIImageHandler *)pNode->Data();
+ wxGDIImageHandler* pHandler = pNode->GetData();
- if (pHandler->GetName() == rName)
- return(pHandler);
- pNode = pNode->Next();
+ if ( pHandler->GetName() == rName )
+ return pHandler;
+ pNode = pNode->GetNext();
}
return(NULL);
}
wxGDIImageHandler* wxGDIImage::FindHandler(
const wxString& rExtension
-, long lType
+, wxBitmapType lType
)
{
- wxNode* pNode = ms_handlers.First();
-
- while (pNode)
+ wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
+ while ( pNode )
{
- wxGDIImageHandler* pHandler = (wxGDIImageHandler *)pNode->Data();
+ wxGDIImageHandler* pHandler = pNode->GetData();
- if ((pHandler->GetExtension() = rExtension) &&
- (lType == -1 || pHandler->GetType() == lType))
+ if ( (pHandler->GetExtension() == rExtension) &&
+ (lType == -1 || pHandler->GetType() == lType) )
{
- return(pHandler);
+ return pHandler;
}
- pNode = pNode->Next();
+ pNode = pNode->GetNext();
}
return(NULL);
}
wxGDIImageHandler* wxGDIImage::FindHandler(
- long lType
+ wxBitmapType lType
)
{
- wxNode* pNode = ms_handlers.First();
+ wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
- while (pNode)
+ while ( pNode )
{
- wxGDIImageHandler* pHandler = (wxGDIImageHandler *)pNode->Data();
+ wxGDIImageHandler* pHandler = pNode->GetData();
- if (pHandler->GetType() == lType)
+ if ( pHandler->GetType() == lType )
return pHandler;
- pNode = pNode->Next();
+ pNode = pNode->GetNext();
}
return(NULL);
}
void wxGDIImage::CleanUpHandlers()
{
- wxNode* pNode = ms_handlers.First();
+ wxGDIImageHandlerList::compatibility_iterator pNode = ms_handlers.GetFirst();
- while (pNode)
+ while ( pNode )
{
- wxGDIImageHandler* pHandler = (wxGDIImageHandler *)pNode->Data();
- wxNode* pNext = pNode->Next();
+ wxGDIImageHandler* pHandler = pNode->GetData();
+ wxGDIImageHandlerList::compatibility_iterator pNext = pNode->GetNext();
delete pHandler;
- delete pNode;
+ ms_handlers.Erase( pNode );
pNode = pNext;
}
}
{
AddHandler(new wxBMPResourceHandler);
AddHandler(new wxBMPFileHandler);
-
- // Not added by default: include xpmhand.h in your app
- // and call these in your wxApp::OnInit.
- // AddHandler(new wxXPMFileHandler);
- // AddHandler(new wxXPMDataHandler);
-
AddHandler(new wxICOResourceHandler);
AddHandler(new wxICOFileHandler);
}
// wxBitmap handlers
// ----------------------------------------------------------------------------
-bool wxBMPResourceHandler::LoadFile(
- wxBitmap* pBitmap
-, const wxString& rName
-, HPS hPs
-, long lFlags
-, int nDesiredWidth
-, int nDesiredHeight
-)
+bool wxBMPResourceHandler::LoadFile( wxBitmap* pBitmap,
+ int nId,
+ wxBitmapType WXUNUSED(lFlags),
+ int WXUNUSED(nDesiredWidth),
+ int WXUNUSED(nDesiredHeight) )
{
- // TODO: load a bitmap from a file
- /*
- rBitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), rName));
-
- wxBitmapRefData* pData = bitmap->GetBitmapData();
-
- if (pBitmap->Ok())
+ SIZEL vSize = {0, 0};
+ DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
+ HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
+
+ pBitmap->SetHBITMAP((WXHBITMAP)::GpiLoadBitmap( hPS
+ ,NULLHANDLE
+ ,nId
+ ,0
+ ,0
+ ));
+ ::GpiDestroyPS(hPS);
+ ::DevCloseDC(hDC);
+
+ wxBitmapRefData* pData = pBitmap->GetBitmapData();
+
+ if ( pBitmap->IsOk() )
{
- BITMAP bm;
-
- if ( !::GetObject(GetHbitmapOf(*pBitmap), sizeof(BITMAP), (LPSTR) &bm) )
- {
- wxLogLastError("GetObject(HBITMAP)");
- }
+ BITMAPINFOHEADER vBmph;
- data->m_width = bm.bmWidth;
- data->m_height = bm.bmHeight;
- data->m_depth = bm.bmBitsPixel;
+ ::GpiQueryBitmapParameters(GetHbitmapOf(*pBitmap), &vBmph);
+ pData->m_nWidth = vBmph.cx;
+ pData->m_nHeight = vBmph.cy;
+ pData->m_nDepth = vBmph.cBitCount;
}
- else
- {
- // it's probably not found
- wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."),
- name.c_str());
- }
-
- return bitmap->Ok();
- */
- return(FALSE);
-}
-
-bool wxBMPFileHandler::LoadFile(
- wxBitmap* pBitmap
-, const wxString& rName
-, HPS hPs
-, long WXUNUSED(lFlags)
-, int WXUNUSED(nDesiredWidth)
-, int WXUNUSED(nDesiredHeight)
-)
+ return(pBitmap->IsOk());
+} // end of wxBMPResourceHandler::LoadFile
+
+bool wxBMPFileHandler::LoadFile( wxBitmap* pBitmap,
+ const wxString& WXUNUSED(rName),
+ HPS WXUNUSED(hPs),
+ wxBitmapType WXUNUSED(lFlags),
+ int WXUNUSED(nDesiredWidth),
+ int WXUNUSED(nDesiredHeight) )
{
-#if wxUSE_IMAGE_LOADING_IN_OS2
- wxPalette* pPalette = NULL;
+#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2
+ wxPalette* pPalette = NULL;
- bool bSuccess = FALSE; /* wxLoadIntoBitmap( WXSTRINGCAST rName
- ,pBitmap
- ,&pPalette
- ) != 0; */
+ bool bSuccess = false; /* wxLoadIntoBitmap( WXSTRINGCAST rName
+ ,pBitmap
+ ,&pPalette
+ ) != 0; */
if (bSuccess && pPalette)
{
pBitmap->SetPalette(*pPalette);
return(bSuccess);
#else
- return(FALSE);
+ wxUnusedVar(pBitmap);
+ return false;
#endif
}
-bool wxBMPFileHandler::SaveFile(
- wxBitmap* pBitmap
-, const wxString& rName
-, int WXUNUSED(nType)
-, const wxPalette* pPal
-)
+bool wxBMPFileHandler::SaveFile( wxBitmap* pBitmap,
+ const wxString& WXUNUSED(rName),
+ wxBitmapType WXUNUSED(nType),
+ const wxPalette* pPal )
{
-#if wxUSE_IMAGE_LOADING_IN_OS2
- wxPalette* pActualPalette = (wxPalette *)pPal;
+#if defined(wxUSE_IMAGE_LOADING_IN_OS2) && wxUSE_IMAGE_LOADING_IN_OS2
+ wxPalette* pActualPalette = (wxPalette *)pPal;
if (!pActualPalette)
pActualPalette = pBitmap->GetPalette();
,pBitmap
,pActualPalette
) != 0); */
- return(FALSE);
+ return false;
#else
- return(FALSE);
+ wxUnusedVar(pBitmap);
+ wxUnusedVar(pPal);
+ return false;
#endif
}
// wxIcon handlers
// ----------------------------------------------------------------------------
-bool wxICOFileHandler::LoadIcon(
- wxIcon* pIcon
-, const wxString& rName
-, HPS hPs
-, long lFlags
-, int nDesiredWidth
-, int nDesiredHeight
-)
+bool wxICOFileHandler::LoadIcon( wxIcon* pIcon,
+ const wxString& WXUNUSED(rName),
+ HPS WXUNUSED(hPs),
+ 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();
- // actual size
- wxSize vSize;
-
- // TODO: load icon directly from a file
- /*
-#ifdef __WIN32__
- HICON hicon = ::ExtractIcon(wxGetInstance(), name, first);
- if ( !hicon )
- {
- wxLogSysError(_T("Failed to load icon from the file '%s'"),
- name.c_str());
-
- return FALSE;
- }
-
- size = GetHiconSize(hicon);
-#else // Win16
- HICON hicon = ReadIconFile((wxChar *)name.c_str(),
- wxGetInstance(),
- &size.x, &size.y);
-#endif // Win32/Win16
-
- if ( (desiredWidth != -1 && desiredWidth != size.x) ||
- (desiredHeight != -1 && desiredHeight != size.y) )
- {
- wxLogDebug(_T("Returning FALSE from wxICOFileHandler::Load because "
- "of the size mismatch: actual (%d, %d), "
- "requested (%d, %d)"),
- size.x, size.y,
- desiredWidth, desiredHeight);
-
- ::DestroyIcon(hicon);
-
- return FALSE;
- }
-
- icon->SetHICON((WXHICON)hicon);
- icon->SetSize(size.x, size.y);
-
- return icon->Ok();
- */
- return(FALSE);
+ return false;
#else
- return(FALSE);
+ wxUnusedVar(pIcon);
+ return false;
#endif
}
-bool wxICOResourceHandler::LoadIcon(
- wxIcon* pIcon
-, const wxString& rName
-, HPS hPs
-, long lFlags
-, int nDesiredWidth
-, int nDesiredHeight
-)
+bool wxICOResourceHandler::LoadIcon( wxIcon* pIcon,
+ const wxString& rName,
+ HPS WXUNUSED(hPs),
+ wxBitmapType WXUNUSED(lFlags),
+ int WXUNUSED(nDesiredWidth),
+ int WXUNUSED(nDesiredHeight) )
{
- // TODO: load icon from a file
- /*
- HICON hicon;
+ HPOINTER hIcon;
-#if defined(__WIN32__) && !defined(__SC__)
- if ( desiredWidth != -1 && desiredHeight != -1 )
- {
- hicon = (HICON)::LoadImage(wxGetInstance(), name, IMAGE_ICON,
- desiredWidth, desiredHeight,
- LR_DEFAULTCOLOR);
- }
- else
-#endif // Win32
- {
- hicon = ::LoadIcon(wxGetInstance(), name);
- }
-
- wxSize size = GetHiconSize(hicon);
- icon->SetSize(size.x, size.y);
-
- // Override the found values with desired values
- if ( desiredWidth > -1 && desiredHeight > -1 )
- {
- icon->SetSize(desiredWidth, desiredHeight);
- }
+ hIcon = ::WinLoadFileIcon( rName.c_str()
+ ,TRUE // load for private use
+ );
- icon->SetHICON((WXHICON)hicon);
+ pIcon->SetSize(32, 32); // all OS/2 icons are 32 x 32
- return icon->Ok();
- */
- return(FALSE);
-}
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-static wxSize GetHiconSize(
- WXHICON hicon
-)
-{
- wxSize vSize(32, 32); // default
-
- // all OS/2 icons are 32x32
- return(vSize);
-}
+ pIcon->SetHICON((WXHICON)hIcon);
+ return pIcon->IsOk();
+} // end of wxICOResourceHandler::LoadIcon
projects / wxWidgets.git / blobdiff