Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No real changes, just remove trailing commas from enums.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2011-10-27 21:10:30 +00:00
parent d0260bd894
commit 2f6b64a90b
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/evtloopsrc.h
View File

@@ -49,7 +49,7 @@ enum
wxEVENT_SOURCE_EXCEPTION = 0x04, wxEVENT_SOURCE_EXCEPTION = 0x04,
wxEVENT_SOURCE_ALL = wxEVENT_SOURCE_INPUT | wxEVENT_SOURCE_ALL = wxEVENT_SOURCE_INPUT |
wxEVENT_SOURCE_OUTPUT | wxEVENT_SOURCE_OUTPUT |
wxEVENT_SOURCE_EXCEPTION, wxEVENT_SOURCE_EXCEPTION
}; };
// wxEventLoopSource itself is an ABC and can't be created directly, currently // wxEventLoopSource itself is an ABC and can't be created directly, currently

8
include/wx/ribbon/art.h
View File

@@ -124,7 +124,7 @@ enum wxRibbonArtSetting
wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_COLOUR, wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_COLOUR,
wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR, wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR,
wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_COLOUR, wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_COLOUR,
wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_GRADIENT_COLOUR, wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_GRADIENT_COLOUR
}; };
enum wxRibbonScrollButtonStyle enum wxRibbonScrollButtonStyle
@@ -146,7 +146,7 @@ enum wxRibbonScrollButtonStyle
wxRIBBON_SCROLL_BTN_FOR_TABS = 16, wxRIBBON_SCROLL_BTN_FOR_TABS = 16,
wxRIBBON_SCROLL_BTN_FOR_PAGE = 32, wxRIBBON_SCROLL_BTN_FOR_PAGE = 32,
wxRIBBON_SCROLL_BTN_FOR_MASK = 48, wxRIBBON_SCROLL_BTN_FOR_MASK = 48
}; };
enum wxRibbonButtonKind 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_ACTIVE_MASK = wxRIBBON_BUTTONBAR_BUTTON_NORMAL_ACTIVE | wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_ACTIVE,
wxRIBBON_BUTTONBAR_BUTTON_DISABLED = 1 << 7, wxRIBBON_BUTTONBAR_BUTTON_DISABLED = 1 << 7,
wxRIBBON_BUTTONBAR_BUTTON_TOGGLED = 1 << 8, wxRIBBON_BUTTONBAR_BUTTON_TOGGLED = 1 << 8,
wxRIBBON_BUTTONBAR_BUTTON_STATE_MASK = 0x1F8, wxRIBBON_BUTTONBAR_BUTTON_STATE_MASK = 0x1F8
}; };
enum wxRibbonGalleryButtonState enum wxRibbonGalleryButtonState
@@ -180,7 +180,7 @@ enum wxRibbonGalleryButtonState
wxRIBBON_GALLERY_BUTTON_NORMAL, wxRIBBON_GALLERY_BUTTON_NORMAL,
wxRIBBON_GALLERY_BUTTON_HOVERED, wxRIBBON_GALLERY_BUTTON_HOVERED,
wxRIBBON_GALLERY_BUTTON_ACTIVE, wxRIBBON_GALLERY_BUTTON_ACTIVE,
wxRIBBON_GALLERY_BUTTON_DISABLED, wxRIBBON_GALLERY_BUTTON_DISABLED
}; };
class wxRibbonPage; class wxRibbonPage;

2
include/wx/ribbon/bar.h
View File

@@ -36,7 +36,7 @@ enum wxRibbonBarOption
wxRIBBON_BAR_FOLDBAR_STYLE = wxRIBBON_BAR_FLOW_VERTICAL wxRIBBON_BAR_FOLDBAR_STYLE = wxRIBBON_BAR_FLOW_VERTICAL
| wxRIBBON_BAR_SHOW_PAGE_ICONS | wxRIBBON_BAR_SHOW_PAGE_ICONS
| wxRIBBON_BAR_SHOW_PANEL_EXT_BUTTONS | wxRIBBON_BAR_SHOW_PANEL_EXT_BUTTONS
| wxRIBBON_BAR_SHOW_PANEL_MINIMISE_BUTTONS, | wxRIBBON_BAR_SHOW_PANEL_MINIMISE_BUTTONS
}; };
class WXDLLIMPEXP_RIBBON wxRibbonBarEvent : public wxNotifyEvent class WXDLLIMPEXP_RIBBON wxRibbonBarEvent : public wxNotifyEvent

2
include/wx/ribbon/panel.h
View File

@@ -24,7 +24,7 @@ enum wxRibbonPanelOption
wxRIBBON_PANEL_EXT_BUTTON = 1 << 3, wxRIBBON_PANEL_EXT_BUTTON = 1 << 3,
wxRIBBON_PANEL_MINIMISE_BUTTON = 1 << 4, wxRIBBON_PANEL_MINIMISE_BUTTON = 1 << 4,
wxRIBBON_PANEL_DEFAULT_STYLE = 0, wxRIBBON_PANEL_DEFAULT_STYLE = 0
}; };
class WXDLLIMPEXP_RIBBON wxRibbonPanel : public wxRibbonControl class WXDLLIMPEXP_RIBBON wxRibbonPanel : public wxRibbonControl

2
include/wx/ribbon/toolbar.h
View File

@@ -35,7 +35,7 @@ enum wxRibbonToolBarToolState
wxRIBBON_TOOLBAR_TOOL_DROPDOWN_ACTIVE = 1 << 6, 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_ACTIVE_MASK = wxRIBBON_TOOLBAR_TOOL_NORMAL_ACTIVE | wxRIBBON_TOOLBAR_TOOL_DROPDOWN_ACTIVE,
wxRIBBON_TOOLBAR_TOOL_DISABLED = 1 << 7, wxRIBBON_TOOLBAR_TOOL_DISABLED = 1 << 7,
wxRIBBON_TOOLBAR_TOOL_STATE_MASK = 0xF8, wxRIBBON_TOOLBAR_TOOL_STATE_MASK = 0xF8
}; };