Notebook page bitmaps now supported.

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index befcfd613d80586cc5eb79230e0d06b593603025..0f49207fd0c0e0f700e4575f89a38883addad53d 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -141,7 +141,7 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
             }
         }
 
             }
         }
 

-        if ( current.empty() ) {
+        if ( current.IsEmpty() ) {

             wxLogDebug(wxT("No accel key found, accel string ignored."));
         }
         else {
             wxLogDebug(wxT("No accel key found, accel string ignored."));
         }
         else {


@@ -262,7 +262,7 @@ void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
             // we should process them here
 
             default:
             // we should process them here
 
             default:

-                if ( wxIsalnum((wxChar)code) )
+                if ( wxIsalnum(code) )

                 {
                     text << (wxChar)code;
 
                 {
                     text << (wxChar)code;