Minor corrections to wxFlexGridSizer ctor documentation.

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

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 927fa245ef8393d2e99b987890420c5a0f35ce61..9a02d8bf5845f071d2dacf0a9c0cbf768a8d41c4 100644 (file)
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -199,12 +199,32 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
         STOCKITEM(wxID_ZOOM_OUT,            _("Zoom &Out"))
 
         default:
         STOCKITEM(wxID_ZOOM_OUT,            _("Zoom &Out"))
 
         default:

-            wxFAIL_MSG( _T("invalid stock item ID") );
+            wxFAIL_MSG( wxT("invalid stock item ID") );

             break;
     };
 
     #undef STOCKITEM
 
             break;
     };
 
     #undef STOCKITEM
 

+    // we assume that buttons use the same labels as menu items but unlike them
+    // they should never use ellipsis
+    if ( (flags & wxSTOCK_FOR_BUTTON) == wxSTOCK_FOR_BUTTON )
+    {
+        wxString baseLabel;
+        if ( stockLabel.EndsWith("...", &baseLabel) )
+            stockLabel = baseLabel;
+
+        wxASSERT_MSG( !(flags & wxSTOCK_WITH_ACCELERATOR),
+                        "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);


@@ -215,7 +235,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
     {
         wxAcceleratorEntry accel = wxGetStockAccelerator(id);
         if (accel.IsOk())
     {
         wxAcceleratorEntry accel = wxGetStockAccelerator(id);
         if (accel.IsOk())

-            stockLabel << _T('\t') << accel.ToString();
+            stockLabel << wxT('\t') << accel.ToString();

     }
 #endif // wxUSE_ACCEL
 
     }
 #endif // wxUSE_ACCEL
 


@@ -308,7 +328,7 @@ bool wxIsStockLabel(wxWindowID id, const wxString& label)
     if (label == stock)
         return true;
 
     if (label == stock)
         return true;
 

-    stock.Replace(_T("&"), wxEmptyString);
+    stock.Replace(wxT("&"), wxEmptyString);

     if (label == stock)
         return true;
 
     if (label == stock)
         return true;