another GetInt/GetId bug fix

[wxWidgets.git] / include / wx / gtk / accel.h

diff --git a/include/wx/gtk/accel.h b/include/wx/gtk/accel.h
index 3f7ce4056e627ef36c6b6020752c5ff23dbdc68b..51efa101f7d126b6ff0647e210b5b7b254e627e3 100644 (file)
--- a/include/wx/gtk/accel.h
+++ b/include/wx/gtk/accel.h
@@ -1,9 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        accel.h
 // Purpose:     wxAcceleratorTable class
-// Author:      Robert
-// Modified by:
-// RCS-ID:      
+// Author:      Robert Roebling
+// RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -16,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_ACCEL
+
 #include "wx/object.h"
 #include "wx/event.h"
 
@@ -54,8 +56,7 @@ extern wxAcceleratorTable wxNullAcceleratorTable;
 
 class wxAcceleratorEntry: public wxObject
 {
-  public:
-
+public:
     wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
       { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
 
@@ -77,30 +78,33 @@ class wxAcceleratorEntry: public wxObject
 
 class wxAcceleratorTable: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-  
-  public:
+public:
     wxAcceleratorTable();
     wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
     ~wxAcceleratorTable();
 
-    inline wxAcceleratorTable(const wxAcceleratorTable& accel) 
+    inline wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject()
       { Ref(accel); }
     inline wxAcceleratorTable(const wxAcceleratorTable* accel) 
       { if (accel) Ref(*accel); }
-    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) 
-      { if (*this == accel) return (*this); Ref(accel); return *this; }
-    inline bool operator == (const wxAcceleratorTable& accel) 
+    inline bool operator == (const wxAcceleratorTable& accel)
       { return m_refData == accel.m_refData; }
     inline bool operator != (const wxAcceleratorTable& accel) 
       { return m_refData != accel.m_refData; }
+    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
+      { if (*this == accel) return (*this); Ref(accel); return *this; }
 
     bool Ok() const;
     
-//  private:
-  
-    int GetCommand( wxKeyEvent &event ); 
+    // implementation
+    // --------------
+ 
+    int GetCommand( wxKeyEvent &event );
     
+private:
+    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 };
 
 #endif
+
+#endif