Initialize paragraph descent in wxRichTextParagraph::Layout().

[wxWidgets.git] / src / osx / menu_osx.cpp

diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp
index a33f2a466db4faccbde605124b1ff0bac04fdb0f..c10dba486ec64294c524a93c0ebc11e8d4f87cd9 100644 (file)
--- a/src/osx/menu_osx.cpp
+++ b/src/osx/menu_osx.cpp
@@ -521,14 +521,20 @@ void wxMenuBar::Init()
     // recommended, sometimes these items really don't make sense.
     if ( wxApp::s_macAboutMenuItemId != wxID_NONE )
     {
-        m_appleMenu->Append( wxApp::s_macAboutMenuItemId, "About..." );
+        wxString aboutLabel("About");
+        if ( wxTheApp )
+            aboutLabel << ' ' << wxTheApp->GetAppDisplayName();
+        else
+            aboutLabel << "...";
+        m_appleMenu->Append( wxApp::s_macAboutMenuItemId, aboutLabel);
         m_appleMenu->AppendSeparator();
     }
 
 #if !wxOSX_USE_CARBON
     if ( wxApp::s_macPreferencesMenuItemId != wxID_NONE )
     {
-        m_appleMenu->Append( wxApp::s_macPreferencesMenuItemId, "Preferences..." );
+        m_appleMenu->Append( wxApp::s_macPreferencesMenuItemId,
+                             "Preferences...\tCtrl+," );
         m_appleMenu->AppendSeparator();
     }