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

Applied patch [ 583922 ] Make generic/wxListCtrl avail. in WIN32

Browse Source 
Generic wxListCtrl renamed to wxGenericListCtrl, wxImageList
renamed to wxGenericImageList, so they can be used on wxMSW
(Rene Rivera).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-07-22 08:51:49 +00:00
parent 70a2c6562f
commit 3cd94a0d11
11 changed files with 164 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/generic/imaglist.cpp
View File

@@ -26,23 +26,23 @@
// wxImageList
//-----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxGenericImageList, wxObject)
wxImageList::wxImageList( int width, int height, bool mask, int initialCount )
wxGenericImageList::wxGenericImageList( int width, int height, bool mask, int initialCount )
{
(void)Create(width, height, mask, initialCount);
}
wxImageList::~wxImageList()
wxGenericImageList::~wxGenericImageList()
{
}
int wxImageList::GetImageCount() const
int wxGenericImageList::GetImageCount() const
{
return m_images.Number();
}
bool wxImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
bool wxGenericImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUSED(initialCount) )
{
m_width = width;
m_height = height;
@@ -50,13 +50,13 @@ bool wxImageList::Create( int width, int height, bool WXUNUSED(mask), int WXUNUS
return Create();
}
bool wxImageList::Create()
bool wxGenericImageList::Create()
{
m_images.DeleteContents( TRUE );
return TRUE;
}
int wxImageList::Add( const wxBitmap &bitmap )
int wxGenericImageList::Add( const wxBitmap &bitmap )
{
if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
m_images.Append( new wxIcon( (const wxIcon&) bitmap ) );
@@ -65,7 +65,7 @@ int wxImageList::Add( const wxBitmap &bitmap )
return m_images.Number()-1;
}
int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
int wxGenericImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
{
wxBitmap bmp(bitmap);
if (mask.Ok())
@@ -73,14 +73,14 @@ int wxImageList::Add( const wxBitmap& bitmap, const wxBitmap& mask )
return Add(bmp);
}
int wxImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
int wxGenericImageList::Add( const wxBitmap& bitmap, const wxColour& maskColour )
{
wxImage img = bitmap.ConvertToImage();
img.SetMaskColour(maskColour.Red(), maskColour.Green(), maskColour.Blue());
return Add(wxBitmap(img));
}
const wxBitmap *wxImageList::GetBitmap( int index ) const
const wxBitmap *wxGenericImageList::GetBitmap( int index ) const
{
wxNode *node = m_images.Nth( index );
@@ -89,7 +89,7 @@ const wxBitmap *wxImageList::GetBitmap( int index ) const
return (wxBitmap*)node->Data();
}
bool wxImageList::Replace( int index, const wxBitmap &bitmap )
bool wxGenericImageList::Replace( int index, const wxBitmap &bitmap )
{
wxNode *node = m_images.Nth( index );
@@ -122,7 +122,7 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap )
return TRUE;
}
bool wxImageList::Remove( int index )
bool wxGenericImageList::Remove( int index )
{
wxNode *node = m_images.Nth( index );
@@ -133,14 +133,14 @@ bool wxImageList::Remove( int index )
return TRUE;
}
bool wxImageList::RemoveAll()
bool wxGenericImageList::RemoveAll()
{
m_images.Clear();
return TRUE;
}
bool wxImageList::GetSize( int index, int &width, int &height ) const
bool wxGenericImageList::GetSize( int index, int &width, int &height ) const
{
width = 0;
height = 0;
@@ -156,7 +156,7 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
return TRUE;
}
bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
bool wxGenericImageList::Draw( int index, wxDC &dc, int x, int y,
int flags, bool WXUNUSED(solidBackground) )
{
wxNode *node = m_images.Nth( index );