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

Split this out from other changes to keep things sane..

Browse Source 
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2003-01-13 05:17:41 +00:00
parent 5797172366
commit b1d4dd7add
59 changed files with 1099 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/generic/imaglist.cpp
View File

@@ -48,7 +48,7 @@ wxGenericImageList::~wxGenericImageList()
int wxGenericImageList::GetImageCount() const
{
return m_images.Number();
return m_images.GetCount();
}
bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
@@ -71,7 +71,7 @@ int wxGenericImageList::Add( const wxBitmap &bitmap )
m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
else
m_images.Append( new wxBitmap(bitmap) );
return m_images.Number()-1;
return m_images.GetCount()-1;
}
int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
@@ -91,16 +91,16 @@ int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour
const wxBitmap *wxGenericImageList::GetBitmap( int index ) const
{
wxNode *node = m_images.Nth( index );
wxNode *node = m_images.Item( index );
wxCHECK_MSG( node, (wxBitmap *) NULL, wxT("wrong index in image list") );
return (wxBitmap*)node->Data();
return (wxBitmap*)node->GetData();
}
bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
{
wxNode *node = m_images.Nth( index );
wxNode *node = m_images.Item( index );
wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
@@ -116,14 +116,14 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
else
newBitmap = new wxBitmap(bitmap) ;
if (index == m_images.Number()-1)
if (index == (int) m_images.GetCount() - 1)
{
m_images.DeleteNode( node );
m_images.Append( newBitmap );
}
else
{
wxNode *next = node->Next();
wxNode *next = node->GetNext();
m_images.DeleteNode( node );
m_images.Insert( next, newBitmap );
}
@@ -133,7 +133,7 @@ bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
bool wxGenericImageList::Remove( int index )
{
wxNode *node = m_images.Nth( index );
wxNode *node = m_images.Item( index );
wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
@@ -154,11 +154,11 @@ bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
width = 0;
height = 0;
wxNode *node = m_images.Nth( index );
wxNode *node = m_images.Item( index );
wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
wxBitmap *bm = (wxBitmap*)node->Data();
wxBitmap *bm = (wxBitmap*)node->GetData();
width = bm->GetWidth();
height = bm->GetHeight();
@@ -168,11 +168,11 @@ bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
int flags, bool WXUNUSED(solidBackground) )
{
wxNode *node = m_images.Nth( index );
wxNode *node = m_images.Item( index );
wxCHECK_MSG( node, FALSE, wxT("wrong index in image list") );
wxBitmap *bm = (wxBitmap*)node->Data();
wxBitmap *bm = (wxBitmap*)node->GetData();
if (bm->IsKindOf(CLASSINFO(wxIcon)))
dc.DrawIcon( * ((wxIcon*) bm), x, y);