missing commit

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

diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp
index 91c39cd06681c1879f7d88e65e920c5911f6abe6..0185018d42602ce2552cb4cd4cbb01a3bce2562b 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,
@@ -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"));
 }
 
 // ----------------------------------------------------------------------------
@@ -162,7 +162,7 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry)
 const wxAcceleratorEntry *
 wxAcceleratorTable::GetEntry(const wxKeyEvent& event) const
 {
-    if ( !Ok() )
+    if ( !IsOk() )
     {
         // not an error, the accel table is just empty
         return NULL;