Allow absent checkbox when transferring dimension data

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

diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp
index 0892b1bfe9a8a29f6b926f197a5e0d95045dda09..fad05d7b8efe671c95d88b57381a8876c9cfe359 100644 (file)
--- a/src/common/stockitem.cpp
+++ b/src/common/stockitem.cpp
@@ -4,7 +4,6 @@
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004-08-15
 // Author:      Vaclav Slavik
 // Modified by:
 // Created:     2004-08-15

-// RCS-ID:      $Id$

 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Vaclav Slavik, 2004
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -137,7 +136,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
 
     switch (id)
     {
 
     switch (id)
     {

-        STOCKITEM(wxID_ABOUT,               _("&About..."),           _("About..."));
+        STOCKITEM(wxID_ABOUT,               _("&About"),           _("About"));

         STOCKITEM(wxID_ADD,                 _("Add"),                 _("Add"));
         STOCKITEM(wxID_APPLY,               _("&Apply"),              _("Apply"));
         STOCKITEM(wxID_BACKWARD,            _("&Back"),               _("Back"));
         STOCKITEM(wxID_ADD,                 _("Add"),                 _("Add"));
         STOCKITEM(wxID_APPLY,               _("&Apply"),              _("Apply"));
         STOCKITEM(wxID_BACKWARD,            _("&Back"),               _("Back"));


@@ -180,7 +179,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
         STOCKITEM(wxID_OPEN,                _("&Open..."),            _("Open..."));
         STOCKITEM(wxID_PASTE,               _("&Paste"),              _("Paste"));
         STOCKITEM(wxID_PREFERENCES,         _("&Preferences"),        _("Preferences"));
         STOCKITEM(wxID_OPEN,                _("&Open..."),            _("Open..."));
         STOCKITEM(wxID_PASTE,               _("&Paste"),              _("Paste"));
         STOCKITEM(wxID_PREFERENCES,         _("&Preferences"),        _("Preferences"));

-        STOCKITEM(wxID_PREVIEW,             _("&Preview..."),         _("Preview..."));
+        STOCKITEM(wxID_PREVIEW,             _("Print previe&w..."),   _("Print preview..."));

         STOCKITEM(wxID_PRINT,               _("&Print..."),           _("Print..."));
         STOCKITEM(wxID_PROPERTIES,          _("&Properties"),         _("Properties"));
         STOCKITEM(wxID_REDO,                _("&Redo"),               _("Redo"));
         STOCKITEM(wxID_PRINT,               _("&Print..."),           _("Print..."));
         STOCKITEM(wxID_PROPERTIES,          _("&Properties"),         _("Properties"));
         STOCKITEM(wxID_REDO,                _("&Redo"),               _("Redo"));


@@ -298,10 +297,14 @@ wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id)
         STOCKITEM(wxID_NEW,                 wxACCEL_CTRL,'N')
         STOCKITEM(wxID_OPEN,                wxACCEL_CTRL,'O')
         STOCKITEM(wxID_PASTE,               wxACCEL_CTRL,'V')
         STOCKITEM(wxID_NEW,                 wxACCEL_CTRL,'N')
         STOCKITEM(wxID_OPEN,                wxACCEL_CTRL,'O')
         STOCKITEM(wxID_PASTE,               wxACCEL_CTRL,'V')

+        STOCKITEM(wxID_PRINT,               wxACCEL_CTRL,'P')

         STOCKITEM(wxID_REDO,                wxACCEL_CTRL | wxACCEL_SHIFT,'Z')
         STOCKITEM(wxID_REPLACE,             wxACCEL_CTRL,'R')
         STOCKITEM(wxID_SAVE,                wxACCEL_CTRL,'S')
         STOCKITEM(wxID_UNDO,                wxACCEL_CTRL,'Z')
         STOCKITEM(wxID_REDO,                wxACCEL_CTRL | wxACCEL_SHIFT,'Z')
         STOCKITEM(wxID_REPLACE,             wxACCEL_CTRL,'R')
         STOCKITEM(wxID_SAVE,                wxACCEL_CTRL,'S')
         STOCKITEM(wxID_UNDO,                wxACCEL_CTRL,'Z')

+#ifdef __WXOSX__
+        STOCKITEM(wxID_PREFERENCES,         wxACCEL_CTRL,',')
+#endif

 
         default:
             // set the wxAcceleratorEntry to return into an invalid state:
 
         default:
             // set the wxAcceleratorEntry to return into an invalid state: