X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/91d33c61a5af8ff5b1dbac696184eecce40476cc..0a6c8516249256c15aecabc9f9d1b96bf86e141f:/include/wx/ribbon/art.h diff --git a/include/wx/ribbon/art.h b/include/wx/ribbon/art.h index d52796b115..e629b38778 100644 --- a/include/wx/ribbon/art.h +++ b/include/wx/ribbon/art.h @@ -16,8 +16,11 @@ #if wxUSE_RIBBON -#include -#include +#include "wx/brush.h" +#include "wx/colour.h" +#include "wx/font.h" +#include "wx/pen.h" +#include "wx/bitmap.h" class WXDLLIMPEXP_FWD_CORE wxDC; class WXDLLIMPEXP_FWD_CORE wxWindow; @@ -151,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 @@ -167,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 @@ -626,7 +631,7 @@ protected: wxColour m_button_bar_active_background_top_colour; wxColour m_button_bar_active_background_top_gradient_colour; wxColour m_gallery_button_background_colour; - wxColour m_gallery_button_background_gradient_colour; + wxColour m_gallery_button_background_gradient_colour; wxColour m_gallery_button_hover_background_colour; wxColour m_gallery_button_hover_background_gradient_colour; wxColour m_gallery_button_active_background_colour;