Remove trailing whitespace from several files

No real changes.

See https://github.com/wxWidgets/wxWidgets/pull/787
This commit is contained in:
Jan Niklas Hasse
2018-04-11 16:15:09 +02:00
committed by Vadim Zeitlin
parent 8d02384792
commit 496da2e550
30 changed files with 134 additions and 134 deletions

View File

@@ -317,7 +317,7 @@ public:
return Ops::GetValue(buf);
}
#if wxUSE_EXTENDED_RTTI
virtual const wxTypeInfo* GetTypeInfo() const
virtual const wxTypeInfo* GetTypeInfo() const
{
return wxGetTypeInfo((T*)NULL);
}
@@ -377,7 +377,7 @@ public: \
const UseDataType* sptr = \
reinterpret_cast<const UseDataType*>(voidPtr); \
return static_cast<T>(*sptr); \
}
}
#if wxUSE_EXTENDED_RTTI
#define WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE) \

View File

@@ -94,7 +94,7 @@ public:
virtual wxRect GetPaperRect() const wxOVERRIDE;
virtual void* GetHandle() const wxOVERRIDE { return NULL; }
protected:
bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,
wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE;

View File

@@ -304,7 +304,7 @@ public:
const wxSize& GetSize() const { return m_size; }
void SetSize(const wxSize& sz) { m_size = sz; }
bool IsOk() const { return m_smallImageList != NULL; }
protected:

View File

@@ -65,7 +65,7 @@ class WXDLLEXPORT wxNotebookPageInfo : public wxObject
public:
wxNotebookPageInfo() { m_page = NULL; m_imageId = -1; m_selected = false; }
virtual ~wxNotebookPageInfo() { }
bool Create(wxNotebookPage *page,
const wxString& text,
bool selected,
@@ -77,18 +77,18 @@ public:
m_imageId = imageId;
return true;
}
wxNotebookPage* GetPage() const { return m_page; }
wxString GetText() const { return m_text; }
bool GetSelected() const { return m_selected; }
int GetImageId() const { return m_imageId; }
private:
wxNotebookPage *m_page;
wxString m_text;
bool m_selected;
int m_imageId;
wxDECLARE_DYNAMIC_CLASS(wxNotebookPageInfo);
};
@@ -139,16 +139,16 @@ public:
// new is wxNOT_FOUND)
void SendPageChangedEvent(int nPageOld, int nPageNew = wxNOT_FOUND);
#if wxUSE_EXTENDED_RTTI
#if wxUSE_EXTENDED_RTTI
// XTI accessors
virtual void AddPageInfo( wxNotebookPageInfo* info );
virtual const wxNotebookPageInfoList& GetPageInfos() const;
#endif
protected:
#if wxUSE_EXTENDED_RTTI
#if wxUSE_EXTENDED_RTTI
wxNotebookPageInfoList m_pageInfos;
#endif
#endif
wxDECLARE_NO_COPY_CLASS(wxNotebookBase);
};

View File

@@ -57,7 +57,7 @@ public:
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr);
bool Create(wxWindow *parent,
wxWindowID id,
const wxString& label,

View File

@@ -5542,7 +5542,7 @@ public:
int GetAnnotationsLinesAdded() const { return m_annotationLinesAdded; }
int GetUpdated() const { return m_updated; }
int GetListCompletionMethod() const { return m_listCompletionMethod; }
#ifdef STC_USE_DND
// Kept for backwards compatibility, use GetString().
wxString GetDragText() { return GetString(); }
@@ -5583,8 +5583,8 @@ private:
int m_x;
int m_y;
int m_token; // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER
int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION
int m_token; // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER
int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION
int m_updated; // wxEVT_STC_UPDATEUI
int m_listCompletionMethod;

View File

@@ -593,7 +593,7 @@ public:
wxEmptyString, wxEmptyString);
}
// implementation only from now on
// -------------------------------

View File

@@ -407,7 +407,7 @@ protected:
wxObject* GetInstance() const { return m_instance; }
wxWindow* GetParentAsWindow() const { return m_parentAsWindow; }
wxArrayString m_styleNames;
wxArrayInt m_styleValues;