merged in the commit from the 2.2 branch

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

diff --git a/include/wx/gtk/accel.h b/include/wx/gtk/accel.h
index 4765e6fe3ddf483f3543d59c3d0729bb439a47fd..51efa101f7d126b6ff0647e210b5b7b254e627e3 100644 (file)
--- a/include/wx/gtk/accel.h
+++ b/include/wx/gtk/accel.h
@@ -15,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_ACCEL
+
 #include "wx/object.h"
 #include "wx/event.h"
 
@@ -53,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; }
 
@@ -76,9 +78,7 @@ class wxAcceleratorEntry: public wxObject
 
 class wxAcceleratorTable: public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-  
-  public:
+public:
     wxAcceleratorTable();
     wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
     ~wxAcceleratorTable();
@@ -96,10 +96,15 @@ class wxAcceleratorTable: public wxObject
 
     bool Ok() const;
     
-//  private:
-  
-    int GetCommand( wxKeyEvent &event ); 
+    // implementation
+    // --------------
+ 
+    int GetCommand( wxKeyEvent &event );
     
+private:
+    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 };
 
 #endif
+
+#endif