All files compile in Unicode mode, but I have only converted things near
points of compiler warnings/errors, they have not been exhaustively reviewed. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -61,7 +61,7 @@ const wxBitmap *wxImageList::GetBitmap( int index ) const
|
||||
{
|
||||
wxNode *node = m_images.Nth( index );
|
||||
|
||||
wxCHECK_MSG( node, (wxBitmap *) NULL, "wrong index in image list" );
|
||||
wxCHECK_MSG( node, (wxBitmap *) NULL, _T("wrong index in image list") );
|
||||
|
||||
return (wxBitmap*)node->Data();
|
||||
}
|
||||
@@ -70,7 +70,7 @@ bool wxImageList::Replace( int index, const wxBitmap &bitmap )
|
||||
{
|
||||
wxNode *node = m_images.Nth( index );
|
||||
|
||||
wxCHECK_MSG( node, FALSE, "wrong index in image list" );
|
||||
wxCHECK_MSG( node, FALSE, _T("wrong index in image list") );
|
||||
|
||||
wxBitmap* newBitmap = NULL;
|
||||
if (bitmap.IsKindOf(CLASSINFO(wxIcon)))
|
||||
@@ -97,7 +97,7 @@ bool wxImageList::Remove( int index )
|
||||
{
|
||||
wxNode *node = m_images.Nth( index );
|
||||
|
||||
wxCHECK_MSG( node, FALSE, "wrong index in image list" );
|
||||
wxCHECK_MSG( node, FALSE, _T("wrong index in image list") );
|
||||
|
||||
m_images.DeleteNode( node );
|
||||
|
||||
@@ -118,7 +118,7 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
|
||||
|
||||
wxNode *node = m_images.Nth( index );
|
||||
|
||||
wxCHECK_MSG( node, FALSE, "wrong index in image list" );
|
||||
wxCHECK_MSG( node, FALSE, _T("wrong index in image list") );
|
||||
|
||||
wxBitmap *bm = (wxBitmap*)node->Data();
|
||||
width = bm->GetWidth();
|
||||
@@ -132,7 +132,7 @@ bool wxImageList::Draw( int index, wxDC &dc, int x, int y,
|
||||
{
|
||||
wxNode *node = m_images.Nth( index );
|
||||
|
||||
wxCHECK_MSG( node, FALSE, "wrong index in image list" );
|
||||
wxCHECK_MSG( node, FALSE, _T("wrong index in image list") );
|
||||
|
||||
wxBitmap *bm = (wxBitmap*)node->Data();
|
||||
|
||||
|
Reference in New Issue
Block a user