1. wxWindow::IsTopLevel() added and documented

[wxWidgets.git] / src / msw / menu.cpp

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 7d926f6ee2d4556acba92709578d664727948540..59fc836e29ff7331a9b17e7dd45af3fa094cb5e7 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -32,6 +32,7 @@
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/utils.h"
+    #include "wx/intl.h"
 #endif
 
 #if wxUSE_OWNER_DRAWN
@@ -179,20 +180,20 @@ void wxMenu::Append(wxMenuItem *pItem)
         else {
             if ( current.Len() == 1 ) {
                 // it's a letter
-                keyCode = wxToupper(current[0]);
+                keyCode = wxToupper(current[0U]);
             }
             else {
                 // it should be a function key
-                if ( current[0] == 'f' && isdigit(current[1]) &&
+                if ( current[0U] == 'f' && isdigit(current[1U]) &&
                      (current.Len() == 2 ||
-                     (current.Len() == 3 && isdigit(current[2]))) ) {
+                     (current.Len() == 3 && isdigit(current[2U]))) ) {
                     int n;
                     sscanf(current.c_str() + 1, "%d", &n);
 
                     keyCode = VK_F1 + n - 1;
                 }
                 else {
-                    wxLogDebug(_T("Unreckognized accel key '%s', accel "
+                    wxLogDebug(_T("Unrecognized accel key '%s', accel "
                                   "string ignored."), current.c_str());
                 }
             }
@@ -1013,7 +1014,7 @@ void wxMenuBar::Attach(wxFrame *frame)
 
     m_menuBarFrame = frame;
 
-    // create the accel table - we consider that the toolbar construction is
+    // create the accel table - we consider that the menubar construction is
     // finished
     size_t nAccelCount = 0;
     int i;
@@ -1022,17 +1023,20 @@ void wxMenuBar::Attach(wxFrame *frame)
         nAccelCount += m_menus[i]->GetAccelCount();
     }
 
-    wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount];
-
-    nAccelCount = 0;
-    for ( i = 0; i < m_menuCount; i++ )
+    if ( nAccelCount )
     {
-        nAccelCount += m_menus[i]->CopyAccels(&accelEntries[nAccelCount]);
-    }
+        wxAcceleratorEntry *accelEntries = new wxAcceleratorEntry[nAccelCount];
 
-    m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);
+        nAccelCount = 0;
+        for ( i = 0; i < m_menuCount; i++ )
+        {
+            nAccelCount += m_menus[i]->CopyAccels(&accelEntries[nAccelCount]);
+        }
+
+        m_accelTable = wxAcceleratorTable(nAccelCount, accelEntries);
 
-    delete [] accelEntries;
+        delete [] accelEntries;
+    }
 }
 
 // ---------------------------------------------------------------------------