X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce00f59b5b169752d2f05ce3bb1a88ddc1b38b4c..2d5409f936104b4a3a1f1f67a36503083414466e:/include/wx/ribbon/art.h?ds=sidebyside diff --git a/include/wx/ribbon/art.h b/include/wx/ribbon/art.h index 9f1a74f890..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 @@ -154,6 +154,7 @@ enum wxRibbonButtonKind wxRIBBON_BUTTON_NORMAL = 1 << 0, wxRIBBON_BUTTON_DROPDOWN = 1 << 1, wxRIBBON_BUTTON_HYBRID = wxRIBBON_BUTTON_NORMAL | wxRIBBON_BUTTON_DROPDOWN, + wxRIBBON_BUTTON_TOGGLE = 1 << 2 }; enum wxRibbonButtonBarButtonState @@ -170,7 +171,8 @@ enum wxRibbonButtonBarButtonState wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_ACTIVE = 1 << 6, wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK = wxRIBBON_BUTTONBAR_BUTTON_NORMAL_ACTIVE | wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_ACTIVE, wxRIBBON_BUTTONBAR_BUTTON_DISABLED = 1 << 7, - wxRIBBON_BUTTONBAR_BUTTON_STATE_MASK = 0xF8, + wxRIBBON_BUTTONBAR_BUTTON_TOGGLED = 1 << 8, + wxRIBBON_BUTTONBAR_BUTTON_STATE_MASK = 0x1F8 }; enum wxRibbonGalleryButtonState @@ -178,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;