Multilib linking fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
010d343bb2
commit
22a5055f1f
@ -15,8 +15,8 @@
|
||||
#include "wx/defs.h"
|
||||
#include "wx/string.h"
|
||||
|
||||
int WXDLLIMPEXP_BASE wxStringSortAscending(wxString*, wxString*);
|
||||
int WXDLLIMPEXP_BASE wxStringSortDescending(wxString*, wxString*);
|
||||
WXDLLIMPEXP_BASE int wxStringSortAscending(wxString*, wxString*);
|
||||
WXDLLIMPEXP_BASE int wxStringSortDescending(wxString*, wxString*);
|
||||
|
||||
#if wxUSE_STL
|
||||
|
||||
|
@ -1763,10 +1763,10 @@ wxString& wxString::replace(size_t nStart, size_t nLen,
|
||||
// ArrayString
|
||||
// ============================================================================
|
||||
|
||||
#if !wxUSE_STL
|
||||
|
||||
#include "wx/arrstr.h"
|
||||
|
||||
#if !wxUSE_STL
|
||||
|
||||
// size increment = min(50% of current size, ARRAY_MAXSIZE_INCREMENT)
|
||||
#define ARRAY_MAXSIZE_INCREMENT 4096
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user