Use wxObjCID instead of "struct objc_object*" to fix clang build.

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

diff --git a/include/wx/osx/accel.h b/include/wx/osx/accel.h
index dcccf61a60d1cfd6ba8b6f6ab38bfdf3b23eb86d..9df01e52302a9052ade14bf077043d55cbdb4f2e 100644 (file)
--- a/include/wx/osx/accel.h
+++ b/include/wx/osx/accel.h
@@ -1,5 +1,34 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/accel.h"
-#else
-#include "wx/mac/carbon/accel.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/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 );
+};
+
 #endif
+    // _WX_ACCEL_H_