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:
parent
545cb3fcf2
commit
03647350fc
@ -26,7 +26,12 @@ struct wxConvertibleTo_SizeHelper
|
||||
template <class D, class B>
|
||||
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
|
||||
{
|
||||
textNew += wxString(
|
||||
#ifndef WXREGEX_CONVERT_TO_MB
|
||||
textNew += wxString(textstr + matchStart + start,
|
||||
textstr
|
||||
#else
|
||||
textNew += wxString(textstr.data() + matchStart +
|
||||
start,
|
||||
textstr.data()
|
||||
#endif
|
||||
+ matchStart + start,
|
||||
*wxConvCurrent, len);
|
||||
|
||||
mayHaveBackrefs = true;
|
||||
@ -601,8 +602,7 @@ int wxRegExImpl::Replace(wxString *text,
|
||||
#ifndef WXREGEX_CONVERT_TO_MB
|
||||
result.append(*text, matchStart, start);
|
||||
#else
|
||||
result.append(wxString(textstr.data() + matchStart, *wxConvCurrent,
|
||||
start));
|
||||
result.append(wxString(textstr.data() + matchStart, *wxConvCurrent, start));
|
||||
#endif
|
||||
matchStart += start;
|
||||
result.append(textNew);
|
||||
|
@ -246,8 +246,8 @@ wxCursor::wxCursor(const char bits[], int width, int height,
|
||||
Create(bits, width, height, hotSpotX, hotSpotY, maskBits);
|
||||
}
|
||||
|
||||
wxCursor::wxCursor(const wxString& name, wxBitmapType type, int hotSpotX,
|
||||
int hotSpotY )
|
||||
wxCursor::wxCursor(const wxString& name, wxBitmapType type,
|
||||
int hotSpotX, int hotSpotY)
|
||||
{
|
||||
// Must be an XBM file
|
||||
if (type != wxBITMAP_TYPE_XBM) {
|
||||
|
@ -420,9 +420,9 @@ pascal OSErr wxMacWindowDragTrackingHandler(
|
||||
// this window is left
|
||||
if ( trackingGlobals->m_currentTarget )
|
||||
{
|
||||
#ifndef __LP64__
|
||||
#ifndef __LP64__
|
||||
HideDragHilite( theDrag );
|
||||
#endif
|
||||
#endif
|
||||
trackingGlobals->m_currentTarget->SetCurrentDragPasteboard( pasteboard );
|
||||
trackingGlobals->m_currentTarget->OnLeave();
|
||||
trackingGlobals->m_currentTarget = NULL;
|
||||
@ -451,9 +451,9 @@ pascal OSErr wxMacWindowDragTrackingHandler(
|
||||
RgnHandle hiliteRgn = NewRgn();
|
||||
Rect r = { y, x, y + win->GetSize().y, x + win->GetSize().x };
|
||||
RectRgn( hiliteRgn, &r );
|
||||
#ifndef __LP64__
|
||||
#ifndef __LP64__
|
||||
ShowDragHilite( theDrag, hiliteRgn, true );
|
||||
#endif
|
||||
#endif
|
||||
DisposeRgn( hiliteRgn );
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user