Old API deprecated. Use new and remove old usage where necessary.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -442,6 +442,15 @@ void wxAppConsole::OnAssert(const wxChar *file,
|
||||
|
||||
#endif // __WXDEBUG__
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_4
|
||||
|
||||
bool wxAppConsole::CheckBuildOptions(const wxBuildOptions& buildOptions)
|
||||
{
|
||||
return CheckBuildOptions(buildOptions.m_signature, "your program");
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
// ============================================================================
|
||||
// other classes implementations
|
||||
// ============================================================================
|
||||
|
@@ -1024,7 +1024,7 @@ wxString::wxString(const char *psz, wxMBConv& conv, size_t nLength)
|
||||
size_t nRealSize;
|
||||
wxWCharBuffer theBuffer = conv.cMB2WC(psz, nLen, &nRealSize);
|
||||
|
||||
//Copy
|
||||
//Copy
|
||||
if (nRealSize)
|
||||
assign( theBuffer.data() , nRealSize - 1 );
|
||||
}
|
||||
@@ -1080,7 +1080,7 @@ wxString::wxString(const wchar_t *pwz, wxMBConv& conv, size_t nLength)
|
||||
size_t nRealSize;
|
||||
wxCharBuffer theBuffer = conv.cWC2MB(pwz, nLen, &nRealSize);
|
||||
|
||||
//Copy
|
||||
//Copy
|
||||
if (nRealSize)
|
||||
assign( theBuffer.data() , nRealSize - 1 );
|
||||
}
|
||||
@@ -1629,7 +1629,7 @@ inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); }
|
||||
wxString& wxString::Trim(bool bFromRight)
|
||||
{
|
||||
// first check if we're going to modify the string at all
|
||||
if ( !IsEmpty() &&
|
||||
if ( !empty() &&
|
||||
(
|
||||
(bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
|
||||
(!bFromRight && wxSafeIsspace(GetChar(0u)))
|
||||
@@ -2195,6 +2195,11 @@ wxString* wxArrayString::GetStringArray() const
|
||||
return array;
|
||||
}
|
||||
|
||||
void wxArrayString::Remove(size_t nIndex, size_t nRemove)
|
||||
{
|
||||
RemoveAt(nIndex, nRemove);
|
||||
}
|
||||
|
||||
#endif // WXWIN_COMPATIBILITY_2_4
|
||||
|
||||
// searches the array for an item (forward or backwards)
|
||||
|
@@ -32,18 +32,12 @@
|
||||
|
||||
#include "wx/palmos/private.h"
|
||||
|
||||
// Set this to 1 to be _absolutely_ sure that repainting will work for all
|
||||
// comctl32.dll versions
|
||||
#define wxUSE_COMCTL32_SAFELY 0
|
||||
|
||||
#include "wx/app.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/dynarray.h"
|
||||
#include "wx/imaglist.h"
|
||||
#include "wx/settings.h"
|
||||
|
||||
#include "wx/palmos/wrapcctl.h"
|
||||
|
||||
// macros to hide the cast ugliness
|
||||
// --------------------------------
|
||||
|
||||
|
Reference in New Issue
Block a user