implement wxLIST_AUTOSIZE support in wxMac's wxListCtrl

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

diff --git a/include/wx/mac/carbon/accel.h b/include/wx/mac/carbon/accel.h
index b576000a8f0eda46769c9b211c6bbfa8447541ff..5a81d61840011f8dca1b054352c4404f8e297039 100644 (file)
--- a/include/wx/mac/carbon/accel.h
+++ b/include/wx/mac/carbon/accel.h
@@ -6,48 +6,31 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "accel.h"
-#endif
-

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

-class WXDLLEXPORT wxAcceleratorTable: public wxObject
+class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject

 {
 DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 public:
     wxAcceleratorTable();
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
 
 {
 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; }
+    virtual ~wxAcceleratorTable();

 
 

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     int GetCommand( wxKeyEvent &event );
 };
 
 
     int GetCommand( wxKeyEvent &event );
 };
 

-// WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
+// WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;

 
 #endif
     // _WX_ACCEL_H_
 
 #endif
     // _WX_ACCEL_H_