X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..68ca12fef650ce4622e05ba4eb21a7aa23849107:/src/os2/icon.cpp?ds=inline diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp index afc541b13f..7f2746b4a2 100644 --- a/src/os2/icon.cpp +++ b/src/os2/icon.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: icon.cpp +// Name: src/os2/icon.cpp // Purpose: wxIcon class // Author: David Webster // Modified by: @@ -13,24 +13,22 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#include "wx/icon.h" + #ifndef WX_PRECOMP - #include "wx/defs.h" #include "wx/list.h" #include "wx/utils.h" #include "wx/app.h" - #include "wx/icon.h" #include "wx/log.h" #endif #include "wx/os2/private.h" #include "assert.h" -#include "wx/icon.h" - - IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject) +IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxGDIObject) // ============================================================================ // implementation @@ -51,35 +49,31 @@ void wxIconRefData::Free() // ---------------------------------------------------------------------------- wxIcon::wxIcon() -: m_bIsXpm(FALSE) + :m_bIsXpm(false) { } -wxIcon::wxIcon( - const char WXUNUSED(bits)[] -, int WXUNUSED(nWidth) -, int WXUNUSED(nHeight) -) -: m_bIsXpm(FALSE) +wxIcon::wxIcon( const char WXUNUSED(bits)[], + int WXUNUSED(nWidth), + int WXUNUSED(nHeight) ) + :m_bIsXpm(false) { } -wxIcon::wxIcon( - const wxString& rIconFile -, long lFlags -, int nDesiredWidth -, int nDesiredHeight -) -: m_bIsXpm(FALSE) +wxIcon::wxIcon( const wxString& rIconFile, + long lFlags, + int nDesiredWidth, + int nDesiredHeight ) + :m_bIsXpm(false) { // // 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); + wxString sOs2Name = rIconFile.Mid(0, rIconFile.length() - 3); - sOs2Name += "Os2.ico"; + sOs2Name += wxT("Os2.ico"); LoadFile( sOs2Name ,lFlags ,nDesiredWidth @@ -100,14 +94,12 @@ void wxIcon::CreateIconFromXpm( CopyFromBitmap(vBmp); if (GetHICON()) { - m_bIsXpm = TRUE; + m_bIsXpm = true; m_vXpmSrc = vBmp; } } // end of wxIcon::CreateIconFromXpm -void wxIcon::CopyFromBitmap( - const wxBitmap& rBmp -) +void wxIcon::CopyFromBitmap( const wxBitmap& rBmp ) { wxMask* pMask = rBmp.GetMask(); HBITMAP hBmp = NULLHANDLE; @@ -128,21 +120,20 @@ void wxIcon::CopyFromBitmap( ); } - BITMAPINFOHEADER2 vHeader; - 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()} - }; - POINTL vPointMask[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight() * 2}, - {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()} - }; - - POINTERINFO vIconInfo; + BITMAPINFOHEADER2 vHeader; + 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()} + }; + POINTL vPointMask[4] = { {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight() * 2}, + {0, 0}, {rBmp.GetWidth(), rBmp.GetHeight()} + }; + POINTERINFO vIconInfo; memset(&vIconInfo, '\0', sizeof(POINTERINFO)); vIconInfo.fPointer = FALSE; // we want an icon, not a pointer @@ -236,9 +227,7 @@ void wxIcon::CopyFromBitmap( vIconInfo.hbmPointer = hBmpMask; - HICON hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP - ,&vIconInfo - ); + HICON hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP, &vIconInfo); if (!hIcon) { @@ -269,12 +258,10 @@ void wxIcon::CopyFromBitmap( ::DevCloseDC(hDCDst); } // end of wxIcon::CopyFromBitmap -bool wxIcon::LoadFile( - const wxString& rFilename -, long lType -, int nDesiredWidth -, int nDesiredHeight -) +bool wxIcon::LoadFile( const wxString& rFilename, + long lType, + int nDesiredWidth, + int nDesiredHeight ) { HPS hPs = NULLHANDLE; @@ -291,6 +278,5 @@ bool wxIcon::LoadFile( ,nDesiredHeight )); else - return(FALSE); + return false; } -