No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it. Some files containing third-party sources (src/msw/wince/time.cpp, src/x11/pango*.cpp) were left unchanged. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -26,7 +26,12 @@ struct wxConvertibleTo_SizeHelper
|
|||||||
template <class D, class B>
|
template <class D, class B>
|
||||||
struct wxConvertibleTo
|
struct wxConvertibleTo
|
||||||
{
|
{
|
||||||
enum { value = sizeof(wxConvertibleTo_SizeHelper<D,B>::Match(static_cast<D*>(NULL)))==sizeof(char)
|
enum
|
||||||
|
{
|
||||||
|
value =
|
||||||
|
sizeof(wxConvertibleTo_SizeHelper<D,B>::Match(static_cast<D*>(NULL)))
|
||||||
|
==
|
||||||
|
sizeof(char)
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -566,12 +566,13 @@ int wxRegExImpl::Replace(wxString *text,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
textNew += wxString(
|
||||||
#ifndef WXREGEX_CONVERT_TO_MB
|
#ifndef WXREGEX_CONVERT_TO_MB
|
||||||
textNew += wxString(textstr + matchStart + start,
|
textstr
|
||||||
#else
|
#else
|
||||||
textNew += wxString(textstr.data() + matchStart +
|
textstr.data()
|
||||||
start,
|
|
||||||
#endif
|
#endif
|
||||||
|
+ matchStart + start,
|
||||||
*wxConvCurrent, len);
|
*wxConvCurrent, len);
|
||||||
|
|
||||||
mayHaveBackrefs = true;
|
mayHaveBackrefs = true;
|
||||||
@@ -601,8 +602,7 @@ int wxRegExImpl::Replace(wxString *text,
|
|||||||
#ifndef WXREGEX_CONVERT_TO_MB
|
#ifndef WXREGEX_CONVERT_TO_MB
|
||||||
result.append(*text, matchStart, start);
|
result.append(*text, matchStart, start);
|
||||||
#else
|
#else
|
||||||
result.append(wxString(textstr.data() + matchStart, *wxConvCurrent,
|
result.append(wxString(textstr.data() + matchStart, *wxConvCurrent, start));
|
||||||
start));
|
|
||||||
#endif
|
#endif
|
||||||
matchStart += start;
|
matchStart += start;
|
||||||
result.append(textNew);
|
result.append(textNew);
|
||||||
|
@@ -246,8 +246,8 @@ wxCursor::wxCursor(const char bits[], int width, int height,
|
|||||||
Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
|
Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxCursor::wxCursor(const wxString& name, wxBitmapType type, int hotSpotX,
|
wxCursor::wxCursor(const wxString& name, wxBitmapType type,
|
||||||
int hotSpotY )
|
int hotSpotX, int hotSpotY)
|
||||||
{
|
{
|
||||||
// Must be an XBM file
|
// Must be an XBM file
|
||||||
if (type != wxBITMAP_TYPE_XBM) {
|
if (type != wxBITMAP_TYPE_XBM) {
|
||||||
|
Reference in New Issue
Block a user