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

some os/2 icon-bitmap fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-12-06 05:01:46 +00:00
parent 58b1642453
commit 43543d985b
13 changed files with 202 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/os2/statbmp.cpp
View File

@@ -47,22 +47,23 @@ bool wxStaticBitmap::Create(
Init();
SetName(rName);
if (pParent) parent->AddChild(this);
if (pParent)
pParent->AddChild(this);
m_backgroundColour = parent->GetBackgroundColour() ;
m_foregroundColour = parent->GetForegroundColour() ;
m_backgroundColour = pParent->GetBackgroundColour() ;
m_foregroundColour = pParent->GetForegroundColour() ;
if ( id == -1 )
if (nId == -1)
m_windowId = (int)NewControlId();
else
m_windowId = nId;
m_windowStyle = lStyle;
int nX= pos.x;
int nY = pos.y;
int nWidth = size.x;
int nHeight = size.y;
int nX= rPos.x;
int nY = rPos.y;
int nWidth = rSize.x;
int nHeight = rSize.y;
m_windowStyle = lStyle;
@@ -70,9 +71,9 @@ bool wxStaticBitmap::Create(
// TODO: create static bitmap control
const wxChar* zClassname = wxT("WX_STATIC");
int nWinstyle ? SS_ICON : SS_BITMAP;
int nWinstyle = m_bIsIcon ? SS_ICON : SS_BITMAP;
m_hWnd = (WXWHND)::WinCreateWindow( pParent->GetHWND()
m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND()
,zClassname
,wxT("")
,nWinstyle | WS_VISIBLE
@@ -97,7 +98,7 @@ bool wxStaticBitmap::Create(
bool wxStaticBitmap::ImageIsOk() const
{
return(m_pImage ** m_pImage->Ok());
return(m_pImage && m_pImage->Ok());
}
void wxStaticBitmap::Free()
@@ -131,7 +132,7 @@ void wxStaticBitmap::SetImage(
int nH;
GetPosition(&nX, &nY);
GetSize(&nW, &nHh);
GetSize(&nW, &nH);
::WinSendMsg( GetHwnd()
,SM_SETHANDLE