From 2f6b64a90bbfbde1778309fe24f01cb0c8ec1caf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 27 Oct 2011 21:10:30 +0000 Subject: [PATCH] No real changes, just remove trailing commas from enums. These commas are not allowed by standard C++ and Sun CC warns about them (and some other compilers, e.g. HP aCC, even give errors for them). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/evtloopsrc.h | 2 +- include/wx/ribbon/art.h | 8 ++++---- include/wx/ribbon/bar.h | 2 +- include/wx/ribbon/panel.h | 2 +- include/wx/ribbon/toolbar.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/evtloopsrc.h b/include/wx/evtloopsrc.h index f5c4266ae5..dd54b9e4a3 100644 --- a/include/wx/evtloopsrc.h +++ b/include/wx/evtloopsrc.h @@ -49,7 +49,7 @@ enum wxEVENT_SOURCE_EXCEPTION = 0x04, wxEVENT_SOURCE_ALL = wxEVENT_SOURCE_INPUT | wxEVENT_SOURCE_OUTPUT | - wxEVENT_SOURCE_EXCEPTION, + wxEVENT_SOURCE_EXCEPTION }; // wxEventLoopSource itself is an ABC and can't be created directly, currently diff --git a/include/wx/ribbon/art.h b/include/wx/ribbon/art.h index e629b38778..55a8deff88 100644 --- a/include/wx/ribbon/art.h +++ b/include/wx/ribbon/art.h @@ -124,7 +124,7 @@ enum wxRibbonArtSetting wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_COLOUR, wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR, wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_COLOUR, - wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_GRADIENT_COLOUR, + wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_GRADIENT_COLOUR }; enum wxRibbonScrollButtonStyle @@ -146,7 +146,7 @@ enum wxRibbonScrollButtonStyle wxRIBBON_SCROLL_BTN_FOR_TABS = 16, wxRIBBON_SCROLL_BTN_FOR_PAGE = 32, - wxRIBBON_SCROLL_BTN_FOR_MASK = 48, + wxRIBBON_SCROLL_BTN_FOR_MASK = 48 }; enum wxRibbonButtonKind @@ -172,7 +172,7 @@ enum wxRibbonButtonBarButtonState wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK = wxRIBBON_BUTTONBAR_BUTTON_NORMAL_ACTIVE | wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_ACTIVE, wxRIBBON_BUTTONBAR_BUTTON_DISABLED = 1 << 7, wxRIBBON_BUTTONBAR_BUTTON_TOGGLED = 1 << 8, - wxRIBBON_BUTTONBAR_BUTTON_STATE_MASK = 0x1F8, + wxRIBBON_BUTTONBAR_BUTTON_STATE_MASK = 0x1F8 }; enum wxRibbonGalleryButtonState @@ -180,7 +180,7 @@ enum wxRibbonGalleryButtonState wxRIBBON_GALLERY_BUTTON_NORMAL, wxRIBBON_GALLERY_BUTTON_HOVERED, wxRIBBON_GALLERY_BUTTON_ACTIVE, - wxRIBBON_GALLERY_BUTTON_DISABLED, + wxRIBBON_GALLERY_BUTTON_DISABLED }; class wxRibbonPage; diff --git a/include/wx/ribbon/bar.h b/include/wx/ribbon/bar.h index 4b26f6e428..a1cb1c2d6d 100644 --- a/include/wx/ribbon/bar.h +++ b/include/wx/ribbon/bar.h @@ -36,7 +36,7 @@ enum wxRibbonBarOption wxRIBBON_BAR_FOLDBAR_STYLE = wxRIBBON_BAR_FLOW_VERTICAL | wxRIBBON_BAR_SHOW_PAGE_ICONS | wxRIBBON_BAR_SHOW_PANEL_EXT_BUTTONS - | wxRIBBON_BAR_SHOW_PANEL_MINIMISE_BUTTONS, + | wxRIBBON_BAR_SHOW_PANEL_MINIMISE_BUTTONS }; class WXDLLIMPEXP_RIBBON wxRibbonBarEvent : public wxNotifyEvent diff --git a/include/wx/ribbon/panel.h b/include/wx/ribbon/panel.h index 0c9f5f887f..83add15ef3 100644 --- a/include/wx/ribbon/panel.h +++ b/include/wx/ribbon/panel.h @@ -24,7 +24,7 @@ enum wxRibbonPanelOption wxRIBBON_PANEL_EXT_BUTTON = 1 << 3, wxRIBBON_PANEL_MINIMISE_BUTTON = 1 << 4, - wxRIBBON_PANEL_DEFAULT_STYLE = 0, + wxRIBBON_PANEL_DEFAULT_STYLE = 0 }; class WXDLLIMPEXP_RIBBON wxRibbonPanel : public wxRibbonControl diff --git a/include/wx/ribbon/toolbar.h b/include/wx/ribbon/toolbar.h index 206d2691ad..eda16e4b3f 100644 --- a/include/wx/ribbon/toolbar.h +++ b/include/wx/ribbon/toolbar.h @@ -35,7 +35,7 @@ enum wxRibbonToolBarToolState wxRIBBON_TOOLBAR_TOOL_DROPDOWN_ACTIVE = 1 << 6, wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK = wxRIBBON_TOOLBAR_TOOL_NORMAL_ACTIVE | wxRIBBON_TOOLBAR_TOOL_DROPDOWN_ACTIVE, wxRIBBON_TOOLBAR_TOOL_DISABLED = 1 << 7, - wxRIBBON_TOOLBAR_TOOL_STATE_MASK = 0xF8, + wxRIBBON_TOOLBAR_TOOL_STATE_MASK = 0xF8 }; -- 2.45.2