Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated info about missing parts in OW headers (now reported and fixed for incoming OW 1.4) and further source cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-07-22 12:57:02 +00:00
parent 8cc3b2e982
commit 77f4f0a700
4 changed files with 338 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/os2/icon.cpp
View File

@@ -51,33 +51,29 @@ 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 += wxT("Os2.ico");
LoadFile( sOs2Name
@@ -234,8 +230,9 @@ void wxIcon::CopyFromBitmap( const wxBitmap& rBmp )
vIconInfo.hbmPointer = hBmpMask;
#ifndef __WATCOMC__
// FIXME: incomplete headers ???
#if !(defined(__WATCOMC__) && __WATCOMC__ < 1240 )
// Open Watcom 1.3 had incomplete headers
// that's reported and should be fixed for OW 1.4
HICON hIcon = ::WinCreatePointerIndirect( HWND_DESKTOP, &vIconInfo);
@@ -269,12 +266,10 @@ void wxIcon::CopyFromBitmap( const wxBitmap& rBmp )
::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,5 +286,5 @@ bool wxIcon::LoadFile(
,nDesiredHeight
));
else
return(FALSE);
return false;
}