wrong move

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

diff --git a/include/wx/osx/accel.h b/include/wx/osx/accel.h
index 85996dc7a014a9c9f12360b1285ed76c2ab082c4..5a81d61840011f8dca1b054352c4404f8e297039 100644 (file)
--- a/include/wx/osx/accel.h
+++ b/include/wx/osx/accel.h
@@ -1,5 +1,36 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/accel.h"
-#else
-#include "wx/osx/carbon/accel.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name:        accel.h
+// Purpose:     wxAcceleratorTable class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_ACCEL_H_
+#define _WX_ACCEL_H_
+
+#include "wx/string.h"
+#include "wx/event.h"
+
+class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
+{
+DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+public:
+    wxAcceleratorTable();
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
+
+    virtual ~wxAcceleratorTable();
+
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
+
+    int GetCommand( wxKeyEvent &event );
+};
+
+// WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;
+
 #endif
+    // _WX_ACCEL_H_