Some work on tabbing and menu accels,

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

diff --git a/include/wx/gtk1/accel.h b/include/wx/gtk1/accel.h
index d2eb53c07007d8d69f68c0a1356cc9c8aed802fb..a60eb15e981ee4d14e609dbea1ac9509655d9769 100644 (file)
--- a/include/wx/gtk1/accel.h
+++ b/include/wx/gtk1/accel.h
@@ -15,6 +15,9 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+
+#if wxUSE_ACCEL
+

 #include "wx/object.h"
 #include "wx/event.h"
 
 #include "wx/object.h"
 #include "wx/event.h"
 


@@ -53,8 +56,7 @@ extern wxAcceleratorTable wxNullAcceleratorTable;
 
 class wxAcceleratorEntry: public wxObject
 {
 
 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; }
 
     wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
       { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
 


@@ -76,30 +78,32 @@ class wxAcceleratorEntry: public wxObject
 
 class wxAcceleratorTable: public wxObject
 {
 
 class wxAcceleratorTable: public wxObject
 {

-  DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-  
-  public:
+public:

     wxAcceleratorTable();
     wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
     ~wxAcceleratorTable();
 
     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); }
       { 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; }
       { 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;
     
 
     bool Ok() const;
     

-//  private:
+//  implementation

   
   

-    int GetCommand( wxKeyEvent &event ); 
+    int GetCommand( wxKeyEvent &event );

     
     

+private:
+    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)

 };
 
 #endif
 };
 
 #endif

+
+#endif