destroy m_impl even if an exception is thrown from the main loop

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

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index 6b61e38b121f6acd8d9aa1f9a07cc11b3954d0ee..7753ac9d6872284c92d1c240fa856ff0081de641 100644 (file)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        accel.h
+// Name:        wx/motif/accel.h

 // Purpose:     wxAcceleratorTable class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxAcceleratorTable class
 // Author:      Julian Smart
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 
 #ifndef _WX_ACCEL_H_
 #define _WX_ACCEL_H_
 

-#ifdef __GNUG__
-#pragma interface "accel.h"
-#endif
-

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


@@ -26,20 +22,13 @@ class WXDLLEXPORT wxAcceleratorTable: public wxObject
 public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource
 public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource

-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
-    
-    // Copy constructors
-    wxAcceleratorTable(const wxAcceleratorTable& accel) { 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;
-    
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
+
+    virtual ~wxAcceleratorTable();
+
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
+

     // Implementation only
     int GetCount() const;
     wxAcceleratorEntry* GetEntries() const;
     // Implementation only
     int GetCount() const;
     wxAcceleratorEntry* GetEntries() const;