Fix wrong format specifiers in the samples.

[wxWidgets.git] / include / wx / ribbon / art.h

diff --git a/include/wx/ribbon/art.h b/include/wx/ribbon/art.h
index f0cc1596e705d7678452440ccc988251cd7ed975..55a8deff88c5cb1f5bfee3f1ade55e586028cfd8 100644 (file)
--- a/include/wx/ribbon/art.h
+++ b/include/wx/ribbon/art.h
@@ -16,8 +16,14 @@
 
 #if wxUSE_RIBBON
 
-#include <wx/brush.h>
-#include <wx/pen.h>
+#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;
 
 enum wxRibbonArtSetting
 {
@@ -118,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
@@ -140,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
@@ -148,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
@@ -164,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
@@ -172,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;
@@ -623,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;