Make wxPORTRAIT and wxLANDSCAPE elements of wxPrintOrientation enum.

[wxWidgets.git] / src / common / stockitem.cpp

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index bf218c5fced004ca8d595cdf0c5e94192e101f25..9a02d8bf5845f071d2dacf0a9c0cbf768a8d41c4 100644 (file)
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -207,7 +207,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
 
     // we assume that buttons use the same labels as menu items but unlike them
     // they should never use ellipsis
 
     // we assume that buttons use the same labels as menu items but unlike them
     // they should never use ellipsis

-    if ( flags & wxSTOCK_FOR_BUTTON )
+    if ( (flags & wxSTOCK_FOR_BUTTON) == wxSTOCK_FOR_BUTTON )

     {
         wxString baseLabel;
         if ( stockLabel.EndsWith("...", &baseLabel) )
     {
         wxString baseLabel;
         if ( stockLabel.EndsWith("...", &baseLabel) )


@@ -217,6 +217,14 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
                         "button labels never use accelerators" );
     }
 
                         "button labels never use accelerators" );
     }
 

+#ifdef __WXMSW__
+    // special case: the "Cancel" button shouldn't have a mnemonic under MSW
+    // for consistency with the native dialogs (which don't use any mnemonic
+    // for it because it is already bound to Esc implicitly)
+    if ( id == wxID_CANCEL )
+        flags &= ~wxSTOCK_WITH_MNEMONIC;
+#endif // __WXMSW__
+

     if ( !(flags & wxSTOCK_WITH_MNEMONIC) )
     {
         stockLabel = wxStripMenuCodes(stockLabel);
     if ( !(flags & wxSTOCK_WITH_MNEMONIC) )
     {
         stockLabel = wxStripMenuCodes(stockLabel);