remove always-true tests of unsigned >= 0

[wxWidgets.git] / src / generic / accel.cpp

diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp
index f31532caa65fba5fb36568e77de762bb97911f50..15054cb15803b83bdd88872e5af026831ca60ade 100644 (file)
--- a/src/generic/accel.cpp
+++ b/src/generic/accel.cpp
@@ -94,8 +94,8 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
         const wxAcceleratorEntry& entry = entries[i];
 
         int keycode = entry.GetKeyCode();
-        if ( isascii(keycode) )
-            keycode = toupper(keycode);
+        if ( wxIsascii(keycode) )
+            keycode = wxToupper(keycode);
 
         M_ACCELDATA->m_accels.Append(new wxAcceleratorEntry(entry.GetFlags(),
                                                             keycode,
@@ -107,7 +107,7 @@ wxAcceleratorTable::~wxAcceleratorTable()
 {
 }
 
-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const
 {
     return m_refData != NULL;
 }
@@ -138,8 +138,8 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry)
         const wxAcceleratorEntry *entryCur = node->GetData();
 
         // given entry contains only the information of the accelerator key
-        // because it was set that way in wxGetAccelFromString()
-        // so do not perform full ( *entryCur == entry ) comparison
+        // because it was set that way during creation so do not use the
+        // comparison operator which also checks the command field
         if ((entryCur->GetKeyCode() == entry.GetKeyCode()) &&
             (entryCur->GetFlags() == entry.GetFlags()))
         {
@@ -152,7 +152,7 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry)
         node = node->GetNext();
     }
 
-    wxFAIL_MSG(_T("deleting inexistent accel from wxAcceleratorTable"));
+    wxFAIL_MSG(wxT("deleting inexistent accel from wxAcceleratorTable"));
 }
 
 // ----------------------------------------------------------------------------