Use wxString::t_str() in calls to Windows API functions in wxMSW.

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

diff --git a/interface/wx/ribbon/art.h b/interface/wx/ribbon/art.h
index c08e5b3cc4a6f73fcb655b5456a8424eda61d72f..d33de734793400e8c9333e9ec5602b36c8f060ac 100644 (file)
--- a/interface/wx/ribbon/art.h
+++ b/interface/wx/ribbon/art.h
@@ -174,6 +174,12 @@ enum wxRibbonButtonKind
         menu, and one which causes a generic action.
     */
     wxRIBBON_BUTTON_HYBRID    = wxRIBBON_BUTTON_NORMAL | wxRIBBON_BUTTON_DROPDOWN,
         menu, and one which causes a generic action.
     */
     wxRIBBON_BUTTON_HYBRID    = wxRIBBON_BUTTON_NORMAL | wxRIBBON_BUTTON_DROPDOWN,

+    
+    /**
+        Normal button or tool with a clickable area which toggles the button
+        between a pressed and unpressed state.
+    */
+    wxRIBBON_BUTTON_TOGGLE    = 1 << 2

 };
 
 /**
 };
 
 /**


@@ -263,7 +269,7 @@ public:
     /**
         Set the value of a certain colour setting to the value @e colour.
         @a id can be one of the colour values of @ref wxRibbonArtSetting, though
     /**
         Set the value of a certain colour setting to the value @e colour.
         @a id can be one of the colour values of @ref wxRibbonArtSetting, though

-        not all colour settings will have an affect on every art provider.
+        not all colour settings will have an effect on every art provider.

         
         @see SetColourScheme()
     */
         
         @see SetColourScheme()
     */


@@ -295,7 +301,7 @@ public:
         default colours of the art provider.
         Note that if SetColour() is called, then GetColourScheme() does not try
         and return a colour scheme similar to colours being used - it's return
         default colours of the art provider.
         Note that if SetColour() is called, then GetColourScheme() does not try
         and return a colour scheme similar to colours being used - it's return

-        values are dependant upon the last values given to SetColourScheme(),
+        values are dependent upon the last values given to SetColourScheme(),

         as described above.
         
         @param[out] primary
         as described above.
         
         @param[out] primary


@@ -449,7 +455,7 @@ public:
     
     /**
         Draw the background and chrome for a wxRibbonGallery control. This
     
     /**
         Draw the background and chrome for a wxRibbonGallery control. This

-        should draw the border, brackground, scroll buttons, extension button,
+        should draw the border, background, scroll buttons, extension button,

         and any other UI elements which are not attached to a specific gallery
         item.
         
         and any other UI elements which are not attached to a specific gallery
         item.
         


@@ -827,7 +833,7 @@ public:
     /**
         Calculate the portion of a page background which needs to be redrawn
         when a page is resized. To optimise the drawing of page backgrounds, as
     /**
         Calculate the portion of a page background which needs to be redrawn
         when a page is resized. To optimise the drawing of page backgrounds, as

-        small an area as possible should be returned. Of couse, if the way in
+        small an area as possible should be returned. Of course, if the way in

         which a background is drawn means that the entire background needs to
         be repainted on resize, then the entire new size should be returned.
         
         which a background is drawn means that the entire background needs to
         be repainted on resize, then the entire new size should be returned.