Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / stockitem.h

diff --git a/interface/wx/stockitem.h b/interface/wx/stockitem.h
index 34801d65781574664b5737e6bddd13a3bb18459e..fc0596d0c7791d457b55ddd46b93e3f5f1527d05 100644 (file)
--- a/interface/wx/stockitem.h
+++ b/interface/wx/stockitem.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of global functions
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -23,8 +23,8 @@ enum wxStockLabelQueryFlag
 
     /**
         Request the label with mnemonics character.
-       
-        E.g. "&Print...".
+
+        E.g. "&Print...".
      */
     wxSTOCK_WITH_MNEMONIC = 1,
 
@@ -34,7 +34,35 @@ enum wxStockLabelQueryFlag
         E.g. "Print...\tCtrl-P". This can be combined with
         wxSTOCK_WITH_MNEMONIC to get "&Print...\tCtrl-P".
      */
-    wxSTOCK_WITH_ACCELERATOR = 2
+    wxSTOCK_WITH_ACCELERATOR = 2,
+
+    /**
+        Return the label without any ellipsis at the end.
+
+        By default, stock items text is returned with ellipsis, if appropriate,
+        this flag allows to avoid having it. So using the same example as
+        above, the returned string would be "Print" or "&Print" if
+        wxSTOCK_WITH_MNEMONIC were also used.
+
+        This flag can't be combined with wxSTOCK_WITH_ACCELERATOR.
+
+        @since 2.9.1
+     */
+    wxSTOCK_WITHOUT_ELLIPSIS = 4,
+
+    /**
+        Return the label appropriate for a button and not a menu item.
+
+        Currently the main difference is that the trailing ellipsis used in
+        some stock labels is never included in the returned label. Also, the
+        mnemonics is included if this flag is used. So the returned value for
+        wxID_PRINT when this flag is used is "&Print".
+
+        This flag can't be combined with wxSTOCK_WITH_ACCELERATOR.
+
+        @since 2.9.1
+     */
+    wxSTOCK_FOR_BUTTON = wxSTOCK_WITHOUT_ELLIPSIS | wxSTOCK_WITH_MNEMONIC
 };
 
 /** @addtogroup group_funcmacro_misc */