Reflect changes in stc.cpp in stc.cpp.in from which it's generated.

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

diff --git a/src/generic/accel.cpp b/src/generic/accel.cpp
index f31532caa65fba5fb36568e77de762bb97911f50..e540ec9c0356084dacc3a29b07d05247fd921ec3 100644 (file)
--- a/src/generic/accel.cpp
+++ b/src/generic/accel.cpp
@@ -3,7 +3,6 @@
 // Purpose:     generic implementation of wxAcceleratorTable class
 // Author:      Robert Roebling
 // Modified:    VZ pn 31.05.01: use typed lists, Unicode cleanup, Add/Remove
 // Purpose:     generic implementation of wxAcceleratorTable class
 // Author:      Robert Roebling
 // Modified:    VZ pn 31.05.01: use typed lists, Unicode cleanup, Add/Remove

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -94,8 +93,8 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
         const wxAcceleratorEntry& entry = entries[i];
 
         int keycode = entry.GetKeyCode();
         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,
 
         M_ACCELDATA->m_accels.Append(new wxAcceleratorEntry(entry.GetFlags(),
                                                             keycode,


@@ -107,7 +106,7 @@ wxAcceleratorTable::~wxAcceleratorTable()
 {
 }
 
 {
 }
 

-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::IsOk() const

 {
     return m_refData != NULL;
 }
 {
     return m_refData != NULL;
 }


@@ -138,8 +137,8 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry)
         const wxAcceleratorEntry *entryCur = node->GetData();
 
         // given entry contains only the information of the accelerator key
         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()))
         {
         if ((entryCur->GetKeyCode() == entry.GetKeyCode()) &&
             (entryCur->GetFlags() == entry.GetFlags()))
         {


@@ -152,7 +151,7 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry)
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 

-    wxFAIL_MSG(_T("deleting inexistent accel from wxAcceleratorTable"));
+    wxFAIL_MSG(wxT("deleting inexistent accel from wxAcceleratorTable"));

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -162,7 +161,7 @@ void wxAcceleratorTable::Remove(const wxAcceleratorEntry& entry)
 const wxAcceleratorEntry *
 wxAcceleratorTable::GetEntry(const wxKeyEvent& event) const
 {
 const wxAcceleratorEntry *
 wxAcceleratorTable::GetEntry(const wxKeyEvent& event) const
 {

-    if ( !Ok() )
+    if ( !IsOk() )

     {
         // not an error, the accel table is just empty
         return NULL;
     {
         // not an error, the accel table is just empty
         return NULL;