many changes; major ones:
1. start of !wxUSE_GUI support 2. _T() macro renamed to T() 3. wxConvertWX2MB and MB2WX macro added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -52,7 +52,7 @@ bool wxListKey::operator==(wxListKeyValue value) const
|
||||
switch ( m_keyType )
|
||||
{
|
||||
default:
|
||||
wxFAIL_MSG(_T("bad key type."));
|
||||
wxFAIL_MSG(T("bad key type."));
|
||||
// let compiler optimize the line above away in release build
|
||||
// by not putting return here...
|
||||
|
||||
@@ -92,7 +92,7 @@ wxNodeBase::wxNodeBase(wxListBase *list,
|
||||
break;
|
||||
|
||||
default:
|
||||
wxFAIL_MSG(_T("invalid key type"));
|
||||
wxFAIL_MSG(T("invalid key type"));
|
||||
}
|
||||
|
||||
if ( previous )
|
||||
@@ -120,7 +120,7 @@ wxNodeBase::~wxNodeBase()
|
||||
|
||||
int wxNodeBase::IndexOf() const
|
||||
{
|
||||
wxCHECK_MSG( m_list, wxNOT_FOUND, _T("node doesn't belong to a list in IndexOf"));
|
||||
wxCHECK_MSG( m_list, wxNOT_FOUND, T("node doesn't belong to a list in IndexOf"));
|
||||
|
||||
// It would be more efficient to implement IndexOf() completely inside
|
||||
// wxListBase (only traverse the list once), but this is probably a more
|
||||
@@ -163,7 +163,7 @@ wxListBase::wxListBase(size_t count, void *elements[])
|
||||
void wxListBase::DoCopy(const wxListBase& list)
|
||||
{
|
||||
wxASSERT_MSG( !list.m_destroy,
|
||||
_T("copying list which owns it's elements is a bad idea") );
|
||||
T("copying list which owns it's elements is a bad idea") );
|
||||
|
||||
m_count = list.m_count;
|
||||
m_destroy = list.m_destroy;
|
||||
@@ -210,7 +210,7 @@ wxNodeBase *wxListBase::Append(void *object)
|
||||
{
|
||||
// all objects in a keyed list should have a key
|
||||
wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
|
||||
_T("need a key for the object to append") );
|
||||
T("need a key for the object to append") );
|
||||
|
||||
wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object);
|
||||
|
||||
@@ -222,7 +222,7 @@ wxNodeBase *wxListBase::Append(long key, void *object)
|
||||
wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
|
||||
(m_keyType == wxKEY_NONE && m_count == 0),
|
||||
(wxNodeBase *)NULL,
|
||||
_T("can't append object with numeric key to this list") );
|
||||
T("can't append object with numeric key to this list") );
|
||||
|
||||
wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
|
||||
return AppendCommon(node);
|
||||
@@ -233,7 +233,7 @@ wxNodeBase *wxListBase::Append (const wxChar *key, void *object)
|
||||
wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
|
||||
(m_keyType == wxKEY_NONE && m_count == 0),
|
||||
(wxNodeBase *)NULL,
|
||||
_T("can't append object with string key to this list") );
|
||||
T("can't append object with string key to this list") );
|
||||
|
||||
wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
|
||||
return AppendCommon(node);
|
||||
@@ -243,10 +243,10 @@ wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
|
||||
{
|
||||
// all objects in a keyed list should have a key
|
||||
wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
|
||||
_T("need a key for the object to insert") );
|
||||
T("need a key for the object to insert") );
|
||||
|
||||
wxCHECK_MSG( !position || position->m_list == this, (wxNodeBase *)NULL,
|
||||
_T("can't insert before a node from another list") );
|
||||
T("can't insert before a node from another list") );
|
||||
|
||||
// previous and next node for the node being inserted
|
||||
wxNodeBase *prev, *next;
|
||||
@@ -288,7 +288,7 @@ wxNodeBase *wxListBase::Item(size_t n) const
|
||||
}
|
||||
}
|
||||
|
||||
wxFAIL_MSG( _T("invalid index in wxListBase::Item") );
|
||||
wxFAIL_MSG( T("invalid index in wxListBase::Item") );
|
||||
|
||||
return (wxNodeBase *)NULL;
|
||||
}
|
||||
@@ -296,7 +296,7 @@ wxNodeBase *wxListBase::Item(size_t n) const
|
||||
wxNodeBase *wxListBase::Find(const wxListKey& key) const
|
||||
{
|
||||
wxASSERT_MSG( m_keyType == key.GetKeyType(),
|
||||
_T("this list is not keyed on the type of this key") );
|
||||
T("this list is not keyed on the type of this key") );
|
||||
|
||||
for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
|
||||
{
|
||||
@@ -349,9 +349,9 @@ void wxListBase::DoDeleteNode(wxNodeBase *node)
|
||||
|
||||
wxNodeBase *wxListBase::DetachNode(wxNodeBase *node)
|
||||
{
|
||||
wxCHECK_MSG( node, NULL, _T("detaching NULL wxNodeBase") );
|
||||
wxCHECK_MSG( node, NULL, T("detaching NULL wxNodeBase") );
|
||||
wxCHECK_MSG( node->m_list == this, NULL,
|
||||
_T("detaching node which is not from this list") );
|
||||
T("detaching node which is not from this list") );
|
||||
|
||||
// update the list
|
||||
wxNodeBase **prevNext = node->GetPrevious() ? &node->GetPrevious()->m_next
|
||||
|
||||
Reference in New Issue
Block a user