case wxID_ABOUT:
case wxID_ADD:
case wxID_APPLY:
+ case wxID_BACKWARD:
case wxID_BOLD:
+ case wxID_BOTTOM:
case wxID_CANCEL:
+ case wxID_CDROM:
case wxID_CLEAR:
case wxID_CLOSE:
+ case wxID_CONVERT:
case wxID_COPY:
case wxID_CUT:
case wxID_DELETE:
+ case wxID_DOWN:
case wxID_EDIT:
- case wxID_FIND:
+ case wxID_EXECUTE:
+ case wxID_EXIT:
case wxID_FILE:
- case wxID_REPLACE:
- case wxID_BACKWARD:
- case wxID_DOWN:
+ case wxID_FIND:
+ case wxID_FIRST:
+ case wxID_FLOPPY:
case wxID_FORWARD:
- case wxID_UP:
+ case wxID_HARDDISK:
case wxID_HELP:
case wxID_HOME:
case wxID_INDENT:
case wxID_INDEX:
+ case wxID_INFO:
case wxID_ITALIC:
+ case wxID_JUMP_TO:
case wxID_JUSTIFY_CENTER:
case wxID_JUSTIFY_FILL:
case wxID_JUSTIFY_LEFT:
case wxID_JUSTIFY_RIGHT:
+ case wxID_LAST:
+ case wxID_NETWORK:
case wxID_NEW:
case wxID_NO:
case wxID_OK:
case wxID_OPEN:
case wxID_PASTE:
case wxID_PREFERENCES:
- case wxID_PRINT:
case wxID_PREVIEW:
+ case wxID_PRINT:
case wxID_PROPERTIES:
- case wxID_EXIT:
case wxID_REDO:
case wxID_REFRESH:
case wxID_REMOVE:
+ case wxID_REPLACE:
case wxID_REVERT_TO_SAVED:
case wxID_SAVE:
case wxID_SAVEAS:
case wxID_SELECTALL:
+ case wxID_SELECT_COLOR:
+ case wxID_SELECT_FONT:
+ case wxID_SORT_ASCENDING:
+ case wxID_SORT_DESCENDING:
+ case wxID_SPELL_CHECK:
case wxID_STOP:
+ case wxID_STRIKETHROUGH:
+ case wxID_TOP:
case wxID_UNDELETE:
case wxID_UNDERLINE:
case wxID_UNDO:
case wxID_UNINDENT:
+ case wxID_UP:
case wxID_YES:
case wxID_ZOOM_100:
case wxID_ZOOM_FIT:
switch (id)
{
- STOCKITEM(wxID_ABOUT, _("&About"))
+ STOCKITEM(wxID_ABOUT, _("&About..."))
STOCKITEM(wxID_ADD, _("Add"))
STOCKITEM(wxID_APPLY, _("&Apply"))
+ STOCKITEM(wxID_BACKWARD, _("&Back"))
STOCKITEM(wxID_BOLD, _("&Bold"))
+ STOCKITEM(wxID_BOTTOM, _("&Bottom"))
STOCKITEM(wxID_CANCEL, _("&Cancel"))
+ STOCKITEM(wxID_CDROM, _("&CD-Rom"))
STOCKITEM(wxID_CLEAR, _("&Clear"))
STOCKITEM(wxID_CLOSE, _("&Close"))
+ STOCKITEM(wxID_CONVERT, _("&Convert"))
STOCKITEM(wxID_COPY, _("&Copy"))
STOCKITEM(wxID_CUT, _("Cu&t"))
STOCKITEM(wxID_DELETE, _("&Delete"))
+ STOCKITEM(wxID_DOWN, _("&Down"))
STOCKITEM(wxID_EDIT, _("&Edit"))
- STOCKITEM(wxID_FIND, _("&Find"))
+ STOCKITEM(wxID_EXECUTE, _("&Execute"))
+ STOCKITEM(wxID_EXIT, _("&Quit"))
STOCKITEM(wxID_FILE, _("&File"))
- STOCKITEM(wxID_REPLACE, _("Rep&lace"))
- STOCKITEM(wxID_BACKWARD, _("&Back"))
- STOCKITEM(wxID_DOWN, _("&Down"))
+ STOCKITEM(wxID_FIND, _("&Find"))
+ STOCKITEM(wxID_FIRST, _("&First"))
+ STOCKITEM(wxID_FLOPPY, _("&Floppy"))
STOCKITEM(wxID_FORWARD, _("&Forward"))
- STOCKITEM(wxID_UP, _("&Up"))
+ STOCKITEM(wxID_HARDDISK, _("&Harddisk"))
STOCKITEM(wxID_HELP, _("&Help"))
STOCKITEM(wxID_HOME, _("&Home"))
STOCKITEM(wxID_INDENT, _("Indent"))
STOCKITEM(wxID_INDEX, _("&Index"))
+ STOCKITEM(wxID_INFO, _("&Info"))
STOCKITEM(wxID_ITALIC, _("&Italic"))
+ STOCKITEM(wxID_JUMP_TO, _("&Jump to"))
STOCKITEM(wxID_JUSTIFY_CENTER, _("Centered"))
STOCKITEM(wxID_JUSTIFY_FILL, _("Justified"))
STOCKITEM(wxID_JUSTIFY_LEFT, _("Align Left"))
STOCKITEM(wxID_JUSTIFY_RIGHT, _("Align Right"))
+ STOCKITEM(wxID_LAST, _("&Last"))
+ STOCKITEM(wxID_NETWORK, _("&Network"))
STOCKITEM(wxID_NEW, _("&New"))
STOCKITEM(wxID_NO, _("&No"))
STOCKITEM(wxID_OK, _("&OK"))
- STOCKITEM(wxID_OPEN, _("&Open"))
+ STOCKITEM(wxID_OPEN, _("&Open..."))
STOCKITEM(wxID_PASTE, _("&Paste"))
STOCKITEM(wxID_PREFERENCES, _("&Preferences"))
- STOCKITEM(wxID_PRINT, _("&Print"))
STOCKITEM(wxID_PREVIEW, _("Print previe&w"))
+ STOCKITEM(wxID_PRINT, _("&Print..."))
STOCKITEM(wxID_PROPERTIES, _("&Properties"))
- STOCKITEM(wxID_EXIT, _("&Quit"))
STOCKITEM(wxID_REDO, _("&Redo"))
STOCKITEM(wxID_REFRESH, _("Refresh"))
STOCKITEM(wxID_REMOVE, _("Remove"))
+ STOCKITEM(wxID_REPLACE, _("Rep&lace"))
STOCKITEM(wxID_REVERT_TO_SAVED, _("Revert to Saved"))
STOCKITEM(wxID_SAVE, _("&Save"))
STOCKITEM(wxID_SAVEAS, _("Save &As..."))
- STOCKITEM(wxID_SELECTALL, _("Select all"))
+ STOCKITEM(wxID_SELECTALL, _("Select &All"))
+ STOCKITEM(wxID_SELECT_COLOR, _("&Color"))
+ STOCKITEM(wxID_SELECT_FONT, _("&Font"))
+ STOCKITEM(wxID_SORT_ASCENDING, _("&Ascending"))
+ STOCKITEM(wxID_SORT_DESCENDING, _("&Descending"))
+ STOCKITEM(wxID_SPELL_CHECK, _("&Spell Check"))
STOCKITEM(wxID_STOP, _("&Stop"))
+ STOCKITEM(wxID_STRIKETHROUGH, _("&Strikethrough"))
+ STOCKITEM(wxID_TOP, _("&Top"))
STOCKITEM(wxID_UNDELETE, _("Undelete"))
STOCKITEM(wxID_UNDERLINE, _("&Underline"))
STOCKITEM(wxID_UNDO, _("&Undo"))
STOCKITEM(wxID_UNINDENT, _("&Unindent"))
+ STOCKITEM(wxID_UP, _("&Up"))
STOCKITEM(wxID_YES, _("&Yes"))
STOCKITEM(wxID_ZOOM_100, _("&Actual Size"))
STOCKITEM(wxID_ZOOM_FIT, _("Zoom to &Fit"))
STOCKITEM(wxID_ZOOM_OUT, _("Zoom &Out"))
default:
- wxFAIL_MSG( _T("invalid stock item ID") );
+ wxFAIL_MSG( wxT("invalid stock item ID") );
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);
{
wxAcceleratorEntry accel = wxGetStockAccelerator(id);
if (accel.IsOk())
- stockLabel << _T('\t') << accel.ToString();
+ stockLabel << wxT('\t') << accel.ToString();
}
#endif // wxUSE_ACCEL
switch (id)
{
- STOCKITEM(wxID_COPY, wxACCEL_CTRL,'C')
- STOCKITEM(wxID_CUT, wxACCEL_CTRL,'X')
- STOCKITEM(wxID_FIND, wxACCEL_CTRL,'F')
- STOCKITEM(wxID_REPLACE, wxACCEL_CTRL,'R')
- STOCKITEM(wxID_HELP, wxACCEL_CTRL,'H')
- STOCKITEM(wxID_NEW, wxACCEL_CTRL,'N')
- STOCKITEM(wxID_OPEN, wxACCEL_CTRL,'O')
- STOCKITEM(wxID_PASTE, wxACCEL_CTRL,'V')
- STOCKITEM(wxID_SAVE, wxACCEL_CTRL,'S')
+ STOCKITEM(wxID_COPY, wxACCEL_CMD,'C')
+ STOCKITEM(wxID_CUT, wxACCEL_CMD,'X')
+ STOCKITEM(wxID_FIND, wxACCEL_CMD,'F')
+ STOCKITEM(wxID_HELP, wxACCEL_CMD,'H')
+ STOCKITEM(wxID_NEW, wxACCEL_CMD,'N')
+ STOCKITEM(wxID_OPEN, wxACCEL_CMD,'O')
+ STOCKITEM(wxID_PASTE, wxACCEL_CMD,'V')
+ STOCKITEM(wxID_REDO, wxACCEL_CMD | wxACCEL_SHIFT,'Z')
+ STOCKITEM(wxID_REPLACE, wxACCEL_CMD,'R')
+ STOCKITEM(wxID_SAVE, wxACCEL_CMD,'S')
+ STOCKITEM(wxID_UNDO, wxACCEL_CMD,'Z')
default:
// set the wxAcceleratorEntry to return into an invalid state:
if (label == stock)
return true;
- stock.Replace(_T("&"), wxEmptyString);
+ stock.Replace(wxT("&"), wxEmptyString);
if (label == stock)
return true;
projects / wxWidgets.git / blobdiff