Skip to content

Commit

Permalink
Remove trailing whitespace from several files
Browse files Browse the repository at this point in the history
No real changes.

See wxWidgets#787
  • Loading branch information
jhasse authored and vadz committed Apr 18, 2018
1 parent 8d02384 commit 496da2e
Show file tree
Hide file tree
Showing 30 changed files with 134 additions and 134 deletions.
4 changes: 2 additions & 2 deletions include/wx/any.h
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ class wxAnyValueTypeImplBase : public wxAnyValueType
return Ops::GetValue(buf);
}
#if wxUSE_EXTENDED_RTTI
virtual const wxTypeInfo* GetTypeInfo() const
virtual const wxTypeInfo* GetTypeInfo() const
{
return wxGetTypeInfo((T*)NULL);
}
Expand Down Expand Up @@ -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) \
Expand Down
2 changes: 1 addition & 1 deletion include/wx/generic/dcpsg.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class WXDLLIMPEXP_CORE wxPostScriptDCImpl : public wxDCImpl
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;
Expand Down
2 changes: 1 addition & 1 deletion include/wx/generic/dirctrlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ class WXDLLIMPEXP_CORE wxFileIconsTable

const wxSize& GetSize() const { return m_size; }
void SetSize(const wxSize& sz) { m_size = sz; }

bool IsOk() const { return m_smallImageList != NULL; }

protected:
Expand Down
16 changes: 8 additions & 8 deletions include/wx/notebook.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -77,18 +77,18 @@ class WXDLLEXPORT wxNotebookPageInfo : public wxObject
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);
};

Expand Down Expand Up @@ -139,16 +139,16 @@ class WXDLLIMPEXP_CORE wxNotebookBase : public wxBookCtrlBase
// 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);
};

Expand Down
2 changes: 1 addition & 1 deletion include/wx/qt/tglbtn.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr);

bool Create(wxWindow *parent,
wxWindowID id,
const wxString& label,
Expand Down
6 changes: 3 additions & 3 deletions include/wx/stc/stc.h
Original file line number Diff line number Diff line change
Expand Up @@ -5542,7 +5542,7 @@ class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
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(); }
Expand Down Expand Up @@ -5583,8 +5583,8 @@ class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
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;

Expand Down
2 changes: 1 addition & 1 deletion include/wx/tbarbase.h
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ class WXDLLIMPEXP_CORE wxToolBarBase : public wxControl
wxEmptyString, wxEmptyString);
}


// implementation only from now on
// -------------------------------

Expand Down
2 changes: 1 addition & 1 deletion include/wx/xrc/xmlreshandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ class WXDLLIMPEXP_CORE wxXmlResourceHandler : public wxObject
wxObject* GetInstance() const { return m_instance; }
wxWindow* GetParentAsWindow() const { return m_parentAsWindow; }


wxArrayString m_styleNames;
wxArrayInt m_styleValues;

Expand Down
20 changes: 10 additions & 10 deletions interface/wx/cmdline.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
parameter - this may be changed by giving non-default flags to it, i.e. use
@c wxCMD_LINE_OPTION_MANDATORY to require that the option is given and
@c wxCMD_LINE_PARAM_OPTIONAL to make a parameter optional.
Also, @c wxCMD_LINE_PARAM_MULTIPLE may be specified if the programs accepts a
variable number of parameters - but it only can be given for the last
parameter in the command line description. If you use this flag, you will
Expand Down Expand Up @@ -67,17 +67,17 @@ enum wxCmdLineEntryType
{
/// A boolean argument of the program; e.g. @c -v to enable verbose mode.
wxCMD_LINE_SWITCH,

/// An argument with an associated value; e.g. @c "-o filename" to specify
/// an optional output filename.
wxCMD_LINE_OPTION,

/// A parameter: a required program argument.
wxCMD_LINE_PARAM,

/// Additional usage text. See wxCmdLineParser::AddUsageText.
wxCMD_LINE_USAGE_TEXT,

wxCMD_LINE_NONE ///< Use this to terminate the list.
};

Expand Down Expand Up @@ -126,7 +126,7 @@ struct wxCmdLineEntryDesc

/**
The usual, short, name of the switch or the option.
It may contain only letters, digits and the underscores.
This field is unused if <tt>kind == wxCMD_LINE_PARAM</tt>.
*/
Expand All @@ -135,7 +135,7 @@ struct wxCmdLineEntryDesc
/**
The long name for this program argument (may be empty if the option
has no long name).
It may contain only letters, digits and the underscores.
This field is unused if <tt>kind == wxCMD_LINE_PARAM</tt>.
*/
Expand All @@ -152,7 +152,7 @@ struct wxCmdLineEntryDesc
See ::wxCmdLineParamType for more info.
*/
wxCmdLineParamType type;

/**
A combination of one or more ::wxCmdLineEntryFlags enum values.
*/
Expand Down Expand Up @@ -348,12 +348,12 @@ class wxCmdLineArgs
In the documentation below the following terminology is used:
- @b switch: a boolean option which can be given or not, but which doesn't have
- @b switch: a boolean option which can be given or not, but which doesn't have
any value. We use the word @e switch to distinguish
such boolean options from more generic options like those
described below. For example, @c "-v" might be a switch
meaning "enable verbose mode".
- @b option: a switch with a value associated to it.
- @b option: a switch with a value associated to it.
For example, @c "-o filename" might be an
option for specifying the name of the output file.
- @b parameter: a required program argument.
Expand Down
8 changes: 4 additions & 4 deletions interface/wx/xrc/xmlres.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class wxXmlResource : public wxObject
*/
void InsertHandler(wxXmlResourceHandler *handler);


/**
Attaches an unknown control to the given panel/window/dialog.
Unknown controls are used in conjunction with \<object class="unknown"\>.
Expand All @@ -115,7 +115,7 @@ class wxXmlResource : public wxObject
*/
static void AddSubclassFactory(wxXmlSubclassFactory *factory);


/**
Compares the XRC version to the argument.
Expand Down Expand Up @@ -785,7 +785,7 @@ class wxXmlResourceHandler : public wxObject
/**
After CreateResource has been called this will return the current
wxXmlResource object.
@since 2.9.5
*/
wxXmlResource* GetResource() const;
Expand Down Expand Up @@ -829,6 +829,6 @@ class wxXmlResourceHandler : public wxObject
@since 2.9.5
*/
wxWindow* GetParentAsWindow() const;
wxWindow* GetParentAsWindow() const;
};

2 changes: 1 addition & 1 deletion src/common/accelcmn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ wxString wxAcceleratorEntry::AsPossiblyLocalizedString(bool localized) const
if ( flags & wxACCEL_RAW_CTRL )
text += PossiblyLocalize(wxTRANSLATE("RawCtrl+"), localized);
#endif

const int code = GetKeyCode();

if ( code >= WXK_F1 && code <= WXK_F12 )
Expand Down
4 changes: 2 additions & 2 deletions src/common/appbase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ int wxAppConsoleBase::OnRun()
}

void wxAppConsoleBase::OnLaunched()
{
{
}

int wxAppConsoleBase::OnExit()
Expand Down Expand Up @@ -376,7 +376,7 @@ int wxAppConsoleBase::MainLoop()

if (wxTheApp)
wxTheApp->OnLaunched();

return m_mainLoop ? m_mainLoop->Run() : -1;
}

Expand Down
10 changes: 5 additions & 5 deletions src/common/cairo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

// keep cairo.h from defining dllimport as we're defining the symbols inside
// the wx dll in order to load them dynamically.
#define cairo_public
#define cairo_public

#include <cairo.h>
#include "wx/dynlib.h"
Expand All @@ -40,7 +40,7 @@

#define wxCAIRO_METHOD_TYPE(name) \
wxCairo##name##_t

#define wxCAIRO_STATIC_METHOD_DEFINE(rettype, name, args, argnames, defret) \
static wxCAIRO_METHOD_TYPE(name) name;

Expand Down Expand Up @@ -192,7 +192,7 @@
m( HDC, cairo_win32_surface_get_dc, \
(cairo_surface_t *surface), (surface), NULL )
#else
#define wxCAIRO_PLATFORM_METHODS(m)
#define wxCAIRO_PLATFORM_METHODS(m)
#endif

#define wxFOR_ALL_CAIRO_METHODS(m) \
Expand Down Expand Up @@ -252,7 +252,7 @@

#define wxCAIRO_DECLARE_VOIDTYPE(name, args, argnames) \
wxCAIRO_DECLARE_TYPE(void, name, args, argnames, NULL)

wxFOR_ALL_CAIRO_VOIDMETHODS(wxCAIRO_DECLARE_VOIDTYPE)
wxFOR_ALL_CAIRO_METHODS(wxCAIRO_DECLARE_TYPE)

Expand Down Expand Up @@ -334,7 +334,7 @@ wxCairo::wxCairo()
}
#endif


#define wxDO_LOAD_FUNC(name, nameStr) \
name = (wxCAIRO_METHOD_TYPE(name))m_libCairo.RawGetSymbol(nameStr); \
if ( !name ) \
Expand Down
4 changes: 2 additions & 2 deletions src/common/cmdline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -850,11 +850,11 @@ int wxCmdLineParser::Parse(bool showUsage)
{
maybeOption = false;
n++;

continue;
}
#endif

// empty argument or just '-' is not an option but a parameter
if ( maybeOption && arg.length() > 1 &&
// FIXME-UTF8: use wc_str() after removing ANSI build
Expand Down
4 changes: 2 additions & 2 deletions src/common/combocmn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2078,7 +2078,7 @@ void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
{
// On Mac, setting focus here led to infinite recursion so
// m_resetFocus is used as a guard

if ( event.GetEventType() == wxEVT_SET_FOCUS )
{
if ( !m_resetFocus && GetTextCtrl() && !GetTextCtrl()->HasFocus() )
Expand All @@ -2088,7 +2088,7 @@ void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
m_resetFocus = false;
}
}

Refresh();
}

Expand Down
4 changes: 2 additions & 2 deletions src/common/ctrlcmn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ struct EllipsizeCalculator
{
EllipsizeCalculator(const wxString& s, const wxDC& dc,
int maxFinalWidthPx, int replacementWidthPx)
:
:
m_initialCharToRemove(0),
m_nCharsToRemove(0),
m_outputNeedsUpdate(true),
Expand Down Expand Up @@ -522,7 +522,7 @@ wxString wxControlBase::Ellipsize(const wxString& label, const wxDC& dc,
{
if (mode == wxELLIPSIZE_NONE)
return label;

wxString ret;

// these cannot be cached between different Ellipsize() calls as they can
Expand Down
2 changes: 1 addition & 1 deletion src/common/filefn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
if ( fullURLRef == NULL)
return wxEmptyString;

if ( additionalPathComponent )
{
CFURLRef parentURLRef = fullURLRef ;
Expand Down
2 changes: 1 addition & 1 deletion src/common/filename.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ void RemoveTrailingSeparatorsFromPath(wxString& strPath)
}
}

#endif // __WINDOWS_
#endif // __WINDOWS_

bool
wxFileSystemObjectExists(const wxString& path, int flags)
Expand Down
2 changes: 1 addition & 1 deletion src/common/listctrlcmn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ wxCONSTRUCTOR_5( wxListCtrl, wxWindow*, Parent, wxWindowID, Id, \
wxPoint, Position, wxSize, Size, long, WindowStyle )

/*
TODO : Expose more information of a list's layout etc. via appropriate objects
TODO : Expose more information of a list's layout etc. via appropriate objects
(see NotebookPageInfo)
*/

Expand Down
Loading

0 comments on commit 496da2e

Please sign in to comment.