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

40
src/generic/imaglist.cpp
View File

@@ -10,7 +10,7 @@
#ifdef __GNUG__
#pragma implementation "imaglist.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@ -58,24 +58,30 @@ int wxImageList::Add( const wxBitmap &bitmap )
return m_images.Number()-1;
}
const wxBitmap *wxImageList::GetBitmap( int index ) const
const wxBitmap *wxImageList::GetBitmap( int index ) const
{
wxNode *node = m_images.Nth( index );
wxCHECK_MSG( node, (wxBitmap *) NULL, wxT("wrong index in image list") );
return (wxBitmap*)node->Data();
}
bool wxImageList::Replace( int index, const wxBitmap &bitmap )
{
wxNode *node = m_images.Nth( index );
wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
wxBitmap* newBitmap = NULL;
if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
#if defined(__VISAGECPP__)
//just can't do this in VisualAge now, with all this new Bitmap-Icon stuff
//so construct it from a bitmap object until I can figure this nonsense out. (DW)
newBitmap = new wxBitmap(bitmap) ;
#else
newBitmap = new wxIcon( (const wxIcon&) bitmap );
#endif
else
newBitmap = new wxBitmap(bitmap) ;
@@ -90,25 +96,25 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap )
m_images.DeleteNode( node );
m_images.Insert( next, newBitmap );
}
return TRUE;
}
bool wxImageList::Remove( int index )
{
wxNode *node = m_images.Nth( index );
wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
m_images.DeleteNode( node );
return TRUE;
}
bool wxImageList::RemoveAll()
{
m_images.Clear();
return TRUE;
}
@@ -116,15 +122,15 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
{
width = 0;
height = 0;
wxNode *node = m_images.Nth( index );
wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
wxBitmap *bm = (wxBitmap*)node->Data();
width = bm->GetWidth();
height = bm->GetHeight();
return TRUE;
}
@@ -132,9 +138,9 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
int flags, bool WXUNUSED(solidBackground) )
{
wxNode *node = m_images.Nth( index );
wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
wxBitmap *bm = (wxBitmap*)node->Data();
if (bm->IsKindOf(CLASSINFO(wxIcon)))