more fixes to dllexport/import stuff for operator<<()s (still bug 1104372)

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index befcfd613d80586cc5eb79230e0d06b593603025..731b1542546b72d3d4ae55583c086b0624ebeee1 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 {
@@ -206,6 +206,7 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                     {
                         wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
                                    current.c_str());
+                        return NULL;
                     }
                 }
             }
@@ -262,7 +263,7 @@ void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
             // we should process them here
 
             default:
-                if ( wxIsalnum((wxChar)code) )
+                if ( wxIsalnum(code) )
                 {
                     text << (wxChar)code;