wxMenuBar::IsEnabled() now returns TRUE sometimes too

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

diff --git a/src/gtk/accel.cpp b/src/gtk/accel.cpp
index 8288d870daf7ce76edbda683ff58fb4db614b290..3d161f1c3142891e0c3c586ae42513b1bb5c2d46 100644 (file)
--- a/src/gtk/accel.cpp
+++ b/src/gtk/accel.cpp
@@ -2,7 +2,7 @@
 // Name:        accel.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        accel.cpp
 // Purpose:
 // Author:      Robert Roebling

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

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


@@ -13,6 +13,8 @@
 
 #include "wx/accel.h"
 
 
 #include "wx/accel.h"
 

+#if wxUSE_ACCEL
+

 #include <ctype.h>
 
 //-----------------------------------------------------------------------------
 #include <ctype.h>
 
 //-----------------------------------------------------------------------------


@@ -21,27 +23,16 @@
 
 class wxAccelRefData: public wxObjectRefData
 {
 
 class wxAccelRefData: public wxObjectRefData
 {

-  public:
+public:

   
   

-    wxAccelRefData(void);
-    ~wxAccelRefData(void);
+  wxAccelRefData(void);

   
   

-    wxList m_accels;
+  wxList m_accels;

 };
 
 wxAccelRefData::wxAccelRefData(void)
 {
 };
 
 wxAccelRefData::wxAccelRefData(void)
 {

-}
-
-wxAccelRefData::~wxAccelRefData(void)
-{
-  wxNode *node = m_accels.First();
-  while (node)
-  {
-    wxAcceleratorEntry *entry = (wxAcceleratorEntry *)node->Data();
-    delete entry;
-    node = node->Next();
-  }
+    m_accels.DeleteContents( TRUE );

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


@@ -52,20 +43,20 @@ 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++)
-  {
-    int flag    = entries[i].GetFlags();
-    int keycode = entries[i].GetKeyCode();
-    int command = entries[i].GetCommand();
-    if ((keycode >= (int)'A') && (keycode <= (int)'Z')) keycode = (int)tolower( (char)keycode );
-    M_ACCELDATA->m_accels.Append( (wxObject*) new wxAcceleratorEntry( flag, keycode, command ) );
-  }
+    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)tolower( (char)keycode );
+        M_ACCELDATA->m_accels.Append( new wxAcceleratorEntry( flag, keycode, command ) );
+    }

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


@@ -74,23 +65,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();
-  }
+    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;
+    return -1;

 }
 
 }
 

+#endif