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

Remove MSVC6 support.

Browse Source 
Don't support this compiler any more, this allows to get rid of tons of
MSVC6-specific workarounds, in particular we can now use Bind() and natural
template functions calls in the library code.

Also remove MSVC6 project and solution files and don't generate them when
bakefile_gen is ran any more (removing the remaining occurrences of msvc6prj
from the bakefiles results in weird bake-time errors, so it's simpler to just
leave them there).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-15 22:32:17 +00:00
parent 28f9670787
commit f4b80e5337
289 changed files with 394 additions and 38949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
include/wx/ustring.h
View File

@@ -198,43 +198,17 @@ public:
return (wxUString &) base->assign( str, pos, n );
}
// FIXME-VC6: VC 6.0 stl does not support all types of assign functions
#ifdef __VISUALC6__
wxUString &assign( wxChar32 ch )
{
wxChar32 chh[1];
chh[0] = ch;
std::basic_string<wxChar32> *base = this;
return (wxUString &)base->assign(chh);
}
wxUString &assign( wxChar32 ch )
{
std::basic_string<wxChar32> *base = this;
return (wxUString &) base->assign( (size_type) 1, ch );
}
wxUString &assign( size_type n, wxChar32 ch )
{
wxU32CharBuffer buffer(n);
wxChar32 *p = buffer.data();
size_type i;
for (i = 0; i < n; i++)
{
*p = ch;
p++;
}
std::basic_string<wxChar32> *base = this;
return (wxUString &)base->assign(buffer.data());
}
#else
wxUString &assign( wxChar32 ch )
{
std::basic_string<wxChar32> *base = this;
return (wxUString &) base->assign( (size_type) 1, ch );
}
wxUString &assign( size_type n, wxChar32 ch )
{
std::basic_string<wxChar32> *base = this;
return (wxUString &) base->assign( n, ch );
}
#endif // __VISUALC6__
wxUString &assign( size_type n, wxChar32 ch )
{
std::basic_string<wxChar32> *base = this;
return (wxUString &) base->assign( n, ch );
}
wxUString &assign( const wxScopedU32CharBuffer &buf )
{
@@ -381,29 +355,11 @@ public:
return (wxUString &) base->append( s, n );
}
// FIXME-VC6: VC 6.0 stl does not support all types of append functions
#ifdef __VISUALC6__
wxUString &append( size_type n, wxChar32 c )
{
wxU32CharBuffer buffer(n);
wxChar32 *p = buffer.data();
size_type i;
for (i = 0; i < n; i++)
{
*p = c;
p++;
}
std::basic_string<wxChar32> *base = this;
return (wxUString &) base->append(buffer.data());
}
#else
wxUString &append( size_type n, wxChar32 c )
{
std::basic_string<wxChar32> *base = this;
return (wxUString &) base->append( n, c );
}
#endif // __VISUALC6__
wxUString &append( size_type n, wxChar32 c )
{
std::basic_string<wxChar32> *base = this;
return (wxUString &) base->append( n, c );
}
wxUString &append( wxChar32 c )
{