Added --use-stl to cnfigure, wxUSE_STL to setup0.h
Moved wx/datetime.inl contents to wx/datetime.h and removed inline redefinition hack. Implemented STL-like interface on top of wxList/wxArray, when wxUSE_STL=0. Implemented wxList-like and wxArray interfaces on top of std::list and std::vector, when wxUSE_STL=1. Added arrstr.h, moved wxArrayString declaration there; string.h #includes arrstr.h only if WXWIN_COMPATIBILITY_2_4 is enabled. Added WX_CLEAR_HASH_MAP, WX_CLEAR_HASH_TABLE, WX_CLEAR_LIST macros, to clear a wxHashMap, wxHashTable, wxList containing pointers: deletes pointers and makes container zero-sized. When wxUSE_STL=1, wxStringList works like a std::list<wxString>. Made wxBase compile when wxUSE_STL=1. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -232,7 +232,7 @@ WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode )
|
||||
// wxPathList
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
|
||||
// IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxStringList)
|
||||
|
||||
static inline wxChar* MYcopystring(const wxString& s)
|
||||
{
|
||||
@@ -248,7 +248,7 @@ static inline wxChar* MYcopystring(const wxChar* s)
|
||||
|
||||
void wxPathList::Add (const wxString& path)
|
||||
{
|
||||
wxStringList::Add (WXSTRINGCAST path);
|
||||
wxStringList::Append (WXSTRINGCAST path);
|
||||
}
|
||||
|
||||
// Add paths e.g. from the PATH environment variable
|
||||
@@ -309,7 +309,7 @@ void wxPathList::EnsureFileAccessible (const wxString& path)
|
||||
|
||||
bool wxPathList::Member (const wxString& path)
|
||||
{
|
||||
for (wxStringList::Node *node = GetFirst(); node; node = node->GetNext())
|
||||
for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
|
||||
{
|
||||
wxString path2( node->GetData() );
|
||||
if (
|
||||
@@ -337,9 +337,9 @@ wxString wxPathList::FindValidPath (const wxString& file)
|
||||
wxChar *filename = (wxChar*) NULL; /* shut up buggy egcs warning */
|
||||
filename = wxIsAbsolutePath (buf) ? wxFileNameFromPath (buf) : (wxChar *)buf;
|
||||
|
||||
for (wxStringList::Node *node = GetFirst(); node; node = node->GetNext())
|
||||
for (wxStringList::compatibility_iterator node = GetFirst(); node; node = node->GetNext())
|
||||
{
|
||||
wxChar *path = node->GetData();
|
||||
const wxChar *path = node->GetData();
|
||||
wxStrcpy (wxFileFunctionsBuffer, path);
|
||||
wxChar ch = wxFileFunctionsBuffer[wxStrlen(wxFileFunctionsBuffer)-1];
|
||||
if (ch != wxT('\\') && ch != wxT('/'))
|
||||
|
Reference in New Issue
Block a user