Updated version to 2.5.5

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

diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h
index 25acc73bead86a3abd1c93f9f7a91e8c8e6bddd4..dcccf61a60d1cfd6ba8b6f6ab38bfdf3b23eb86d 100644 (file)
--- a/include/wx/mac/accel.h
+++ b/include/wx/mac/accel.h
@@ -1,53 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// 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_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "accel.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/accel.h"
+#else
+#include "wx/mac/carbon/accel.h"

 #endif
 #endif

-
-#include "wx/string.h"
-#include "wx/event.h"
-
-class WXDLLEXPORT wxAcceleratorTable: public wxObject
-{
-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-public:
-    wxAcceleratorTable();
-    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
-
-    // Copy constructors
-    wxAcceleratorTable(const wxAcceleratorTable& accel)
-        : wxObject()
-    { Ref(accel); }
-    wxAcceleratorTable(const wxAcceleratorTable* accel)
-    { if (accel) Ref(*accel); }
-
-    ~wxAcceleratorTable();
-
-    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
-    { if (*this == accel) return (*this); Ref(accel); return *this; }
-    bool operator == (const wxAcceleratorTable& accel)
-    { return m_refData == accel.m_refData; }
-    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_