correction to maintain data array in synch with string array

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

diff --git a/src/gtk/accel.cpp b/src/gtk/accel.cpp
index 08b5436b343b8ad0db31a129152b4843afc522b0..f3f9ba6a686cf67876361ab94261dd6d13f27b33 100644 (file)
--- a/src/gtk/accel.cpp
+++ b/src/gtk/accel.cpp
@@ -2,9 +2,9 @@
 // Name:        accel.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        accel.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Id:
+// Id:          $id:$

 // Copyright:   (c) 1998 Robert Roebling
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -13,22 +13,25 @@
 
 #include "wx/accel.h"
 
 
 #include "wx/accel.h"
 

+#if wxUSE_ACCEL
+
+#include <ctype.h>
+

 //-----------------------------------------------------------------------------
 // wxAcceleratorTable
 //-----------------------------------------------------------------------------
 
 class wxAccelRefData: public wxObjectRefData
 {
 //-----------------------------------------------------------------------------
 // wxAcceleratorTable
 //-----------------------------------------------------------------------------
 
 class wxAccelRefData: public wxObjectRefData
 {

-  public:
-  
-    wxAccelRefData(void);
-  
+public:
+    wxAccelRefData();
+

     wxList m_accels;
 };
 
     wxList m_accels;
 };
 

-wxAccelRefData::wxAccelRefData(void)
+wxAccelRefData::wxAccelRefData()

 {
 {

-  m_accels.DeleteContents( TRUE );
+    m_accels.DeleteContents( TRUE );

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


@@ -36,20 +39,23 @@ wxAccelRefData::wxAccelRefData(void)
 #define M_ACCELDATA ((wxAccelRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable,wxObject)
 #define M_ACCELDATA ((wxAccelRefData *)m_refData)
 
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable,wxObject)

-  
+

 wxAcceleratorTable::wxAcceleratorTable()
 {
 wxAcceleratorTable::wxAcceleratorTable()
 {

-  m_refData = new wxAccelRefData();

 }
 
 wxAcceleratorTable::wxAcceleratorTable( int n, wxAcceleratorEntry entries[] )
 {
 }
 
 wxAcceleratorTable::wxAcceleratorTable( int n, wxAcceleratorEntry entries[] )
 {

-  m_refData = new wxAccelRefData();
-  for (int i = 0; i < n; i++)
-  {
-    M_ACCELDATA->m_accels.Append( (wxObject*)
-      new wxAcceleratorEntry( entries[n].GetFlags(), entries[n].GetKeyCode(), entries[n].GetCommand() ) );
-  }
+    m_refData = new wxAccelRefData();
+
+    for (int i = 0; i < n; i++)
+    {
+        int flag    = entries[i].GetFlags();
+        int keycode = entries[i].GetKeyCode();
+        int command = entries[i].GetCommand();
+        if ((keycode >= (int)'a') && (keycode <= (int)'z')) keycode = (int)toupper( (char)keycode );
+        M_ACCELDATA->m_accels.Append( new wxAcceleratorEntry( flag, keycode, command ) );
+    }

 }
 
 wxAcceleratorTable::~wxAcceleratorTable()
 }
 
 wxAcceleratorTable::~wxAcceleratorTable()


@@ -58,23 +64,28 @@ wxAcceleratorTable::~wxAcceleratorTable()
 
 bool wxAcceleratorTable::Ok() const
 {
 
 bool wxAcceleratorTable::Ok() const
 {

-  return (m_refData != NULL);
+    return (m_refData != NULL);

 }
 
 int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 {
 }
 
 int wxAcceleratorTable::GetCommand( wxKeyEvent &event )
 {

-  wxNode *node = M_ACCELDATA->m_accels.First();
-  while (node)
-  {
-    wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->Data();
-    if ((event.m_keyCode == entry->GetKeyCode()) &&
-        (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
-        (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&
-        (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown() || event.MetaDown()))
-      return entry->GetCommand();
-    node = node->Next();
-  }
-  
-  return -1;
+    if (!Ok()) return -1;
+
+    wxNode *node = M_ACCELDATA->m_accels.First();
+    while (node)
+    {
+        wxAcceleratorEntry *entry = (wxAcceleratorEntry*)node->Data();
+        if ((event.m_keyCode == entry->GetKeyCode()) &&
+           (((entry->GetFlags() & wxACCEL_CTRL) == 0) || event.ControlDown()) &&
+           (((entry->GetFlags() & wxACCEL_SHIFT) == 0) || event.ShiftDown()) &&
+           (((entry->GetFlags() & wxACCEL_ALT) == 0) || event.AltDown() || event.MetaDown()))
+        {
+            return entry->GetCommand();
+        }
+        node = node->Next();
+    }
+
+    return -1;

 }
 
 }
 

+#endif