applied patch #931719: "ESC closes dialog instead of combobox dropdown" (closes patch...

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

diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h
index 4e227ca2485db89eaee2914d9b391e467161ff9b..ae8c042e5c7816b9076ed1960d3952c901ab820b 100644 (file)
--- a/include/wx/mac/accel.h
+++ b/include/wx/mac/accel.h
@@ -1,46 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        accel.h
-// Purpose:     wxAcceleratorTable class
-// Author:      AUTHOR
-// Modified by:
-// Created:     ??/??/98
-// RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ACCEL_H_
-#define _WX_ACCEL_H_
-
-#ifdef __GNUG__
-#pragma interface "accel.h"
-#endif
-
-#include "wx/string.h"
-
-class WXDLLEXPORT wxAcceleratorTable: public wxObject
-{
-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-public:
-    wxAcceleratorTable();
-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
-
-    // Copy constructors
-    inline wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
-    inline wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); }
-
-    ~wxAcceleratorTable();
-
-    inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if (*this == accel) return (*this); Ref(accel); return *this; }
-    inline bool operator == (const wxAcceleratorTable& accel) { return m_refData == accel.m_refData; }
-    inline bool operator != (const wxAcceleratorTable& accel) { return m_refData != accel.m_refData; }
-
-    bool Ok() const;
-
-    int GetCommand( wxKeyEvent &event );
-};
-
-WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
-
-#endif
-    // _WX_ACCEL_H_
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/accel.h"
+#else
+#include "wx/mac/carbon/accel.h"
+#endif
\ No newline at end of file