#endif
#ifndef WX_PRECOMP
-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/icon.h"
+ #include "wx/defs.h"
+ #include "wx/list.h"
+ #include "wx/utils.h"
+ #include "wx/app.h"
+ #include "wx/icon.h"
#endif
#include "wx/os2/private.h"
#include "wx/icon.h"
-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxBitmapHandler)
-#endif
+ IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)
-/*
- * Icons
- */
+// ============================================================================
+// implementation
+// ============================================================================
-wxIconRefData::wxIconRefData()
-{
- m_hIcon = (WXHICON) NULL ;
-}
+// ----------------------------------------------------------------------------
+// wxIconRefData
+// ----------------------------------------------------------------------------
-wxIconRefData::~wxIconRefData()
+void wxIconRefData::Free()
{
- if ( m_hIcon )
- return;
- // TODO ::DestroyIcon((HICON) m_hIcon);
+ if (m_hIcon)
+ ::WinFreeFileIcon((HPOINTER)m_hIcon);
}
+// ----------------------------------------------------------------------------
+// wxIcon
+// ----------------------------------------------------------------------------
+
wxIcon::wxIcon()
{
}
-wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height))
+wxIcon::wxIcon(
+ const char WXUNUSED(bits)[]
+, int WXUNUSED(nWidth)
+, int WXUNUSED(nHeight)
+)
{
}
-wxIcon::wxIcon(const wxString& icon_file, long flags,
- int desiredWidth, int desiredHeight)
-
+wxIcon::wxIcon(
+ const wxString& rIconFile
+, long lFlags
+, int nDesiredWidth
+, int nDesiredHeight
+)
{
- LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+ //
+ // A very poor hack, but we have to have separate icon files from windows
+ // So we have a modified name where replace the last three characters
+ // with os2. Also need the extension.
+ //
+ wxString sOs2Name = rIconFile.Mid(0, rIconFile.Length() - 3);
+
+ sOs2Name += "Os2.ico";
+ LoadFile( sOs2Name
+ ,lFlags
+ ,nDesiredWidth
+ ,nDesiredHeight
+ );
}
wxIcon::~wxIcon()
{
}
-bool wxIcon::LoadFile(const wxString& filename, long type,
- int desiredWidth, int desiredHeight)
+void wxIcon::CreateIconFromXpm(
+ const char** ppData
+)
{
- UnRef();
+ wxBitmap vBmp(ppData);
- m_refData = new wxIconRefData;
+ CopyFromBitmap(vBmp);
+} // end of wxIcon::CreateIconFromXpm
- wxBitmapHandler *handler = FindHandler(type);
-
- if ( handler )
- return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
- else
- return FALSE;
-}
-
-void wxIcon::SetHICON(WXHICON ico)
+void wxIcon::CopyFromBitmap(
+ const wxBitmap& rBmp
+)
{
- if ( !M_ICONDATA )
- m_refData = new wxIconRefData;
-
- M_ICONDATA->m_hIcon = ico;
-}
+ wxMask* pMask = rBmp.GetMask();
-bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight)
-{
- return FALSE;
-}
+ if (!pMask)
+ {
+ //
+ // We must have a mask for an icon, so even if it's probably incorrect,
+ // do create it (grey is the "standard" transparent colour)
+ //
+ pMask = new wxMask( rBmp
+ ,*wxLIGHT_GREY
+ );
+ }
-bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
- int desiredWidth, int desiredHeight)
-{
-// TODO
-/*
- if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
- {
- if (desiredWidth > -1 && desiredHeight > -1)
+ POINTERINFO vIconInfo;
+
+ memset(&vIconInfo, '\0', sizeof(POINTERINFO));
+ vIconInfo.fPointer = FALSE; // we want an icon, not a pointer
+ vIconInfo.hbmColor = GetHbitmapOf(rBmp);
+
+ SIZEL vSize = {0, 0};
+ DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
+ HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
+ HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
+ POINTL vPoint[4] = { 0, 0, rBmp.GetWidth(), rBmp.GetHeight(),
+ 0, 0, rBmp.GetWidth(), rBmp.GetHeight()
+ };
+ ::GpiSetBitmap(hPSSrc, (HBITMAP) pMask->GetMaskBitmap());
+ ::GpiSetBitmap(hPSDst, (HBITMAP) vIconInfo.hbmColor);
+ ::GpiBitBlt( hPSDst
+ ,hPSSrc
+ ,4L
+ ,vPoint
+ ,ROP_SRCAND
+ ,BBO_IGNORE
+ );
+
+ ::GpiSetBitmap(hPSSrc, NULL);
+ ::GpiSetBitmap(hPSDst, NULL);
+ ::GpiDestroyPS(hPSSrc);
+ ::GpiDestroyPS(hPSDst);
+ ::DevCloseDC(hDCSrc);
+ ::DevCloseDC(hDCDst);
+
+ HICON hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP
+ ,&vIconInfo
+ );
+
+ if (!hIcon)
{
- M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadImage(wxGetInstance(), name, IMAGE_ICON, desiredWidth, desiredHeight, LR_DEFAULTCOLOR);
+ wxLogLastError(wxT("WinCreatePointerIndirect"));
}
else
{
- M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadIcon(wxGetInstance(), name);
+ SetHICON((WXHICON)hIcon);
+ SetSize( rBmp.GetWidth()
+ ,rBmp.GetHeight()
+ );
}
- ICONINFO info ;
- if (::GetIconInfo((HICON) M_ICONHANDLERDATA->m_hIcon, &info))
+ if (!rBmp.GetMask())
{
- HBITMAP ms_bitmap = info.hbmMask ;
- if (ms_bitmap)
- {
- BITMAP bm;
- ::GetObject(ms_bitmap, sizeof(BITMAP), (LPSTR) &bm);
- M_ICONHANDLERDATA->m_width = bm.bmWidth;
- M_ICONHANDLERDATA->m_height = bm.bmHeight;
- }
- if (info.hbmMask)
- ::DeleteObject(info.hbmMask) ;
- if (info.hbmColor)
- ::DeleteObject(info.hbmColor) ;
- }
- }
- // Override the found values with desired values
- if (desiredWidth > -1 && desiredHeight > -1)
- {
- M_ICONHANDLERDATA->m_width = desiredWidth;
- M_ICONHANDLERDATA->m_height = desiredHeight;
+ //
+ // We created the mask, now delete it
+ //
+ delete pMask;
}
+} // end of wxIcon::CopyFromBitmap
+
+bool wxIcon::LoadFile(
+ const wxString& rFilename
+, long lType
+, int nDesiredWidth
+, int nDesiredHeight
+)
+{
+ HPS hPs = NULLHANDLE;
+
+ UnRef();
- M_ICONHANDLERDATA->m_ok = (M_ICONHANDLERDATA->m_hIcon != 0);
- return M_ICONHANDLERDATA->m_ok;
- }
- else
-*/
- return FALSE;
+ wxGDIImageHandler* pHandler = FindHandler(lType);
+
+ if (pHandler)
+ return(pHandler->Load( this
+ ,rFilename
+ ,hPs
+ ,lType
+ ,nDesiredWidth
+ ,nDesiredHeight
+ ));
+ else
+ return(FALSE);
}
projects / wxWidgets.git / blobdiff