Further performance optimizations

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

diff --git a/include/wx/palmos/accel.h b/include/wx/palmos/accel.h
index 1fdc34b5a7dea345e5ec25ddfcce657d76ff2d94..4f82696b8d5743f43647e075f5e89cb005d1cbb6 100644 (file)
--- a/include/wx/palmos/accel.h
+++ b/include/wx/palmos/accel.h
@@ -16,15 +16,12 @@
 // the accel table has all accelerators for a given window or menu
 // ----------------------------------------------------------------------------
 
 // the accel table has all accelerators for a given window or menu
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     // default ctor
     wxAcceleratorTable();
 
 {
 public:
     // default ctor
     wxAcceleratorTable();
 

-    // copy ctor
-    wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
-

     // load from .rc resource (Windows specific)
     wxAcceleratorTable(const wxString& resource);
 
     // load from .rc resource (Windows specific)
     wxAcceleratorTable(const wxString& resource);
 


@@ -33,16 +30,8 @@ public:
 
     virtual ~wxAcceleratorTable();
 
 
     virtual ~wxAcceleratorTable();
 

-    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) Ref(accel); return *this; }
-
-#if WXWIN_COMPATIBILITY_2_4
-    bool operator==(const wxAcceleratorTable& accel) const
-        { return m_refData == accel.m_refData; }
-    bool operator!=(const wxAcceleratorTable& accel) const
-        { return !(*this == accel); }
-#endif
-
-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() const;
 
     void SetHACCEL(WXHACCEL hAccel);
     WXHACCEL GetHACCEL() const;