cleaning up problems after string changes

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

diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index 121d5e349d50245ea0069bc693113ec6b3364076..236c044b0c84a835688b07b25cbbaba10cac4814 100644 (file)
--- a/include/wx/msw/accel.h
+++ b/include/wx/msw/accel.h
@@ -6,15 +6,13 @@
 // Created:     31/7/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     31/7/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// 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
+class WXDLLIMPEXP_CORE wxWindow;

 
 // ----------------------------------------------------------------------------
 // the accel table has all accelerators for a given window or menu
 
 // ----------------------------------------------------------------------------
 // the accel table has all accelerators for a given window or menu


@@ -24,10 +22,7 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     // default ctor
 {
 public:
     // default ctor

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

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


@@ -35,19 +30,12 @@ public:
     // initialize from array
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
 
     // initialize from array
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);
 

-    virtual ~wxAcceleratorTable();
-
-    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if ( *this != accel ) Ref(accel); return *this; }
-    bool operator==(const wxAcceleratorTable& accel) const
-        { return m_refData == accel.m_refData; } // FIXME: this is wrong (VZ)
-    bool operator!=(const wxAcceleratorTable& accel) const
-        { return !(*this == accel); }
-
-    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;
 

-    // translate the accelerator, return TRUE if done
+    // translate the accelerator, return true if done

     bool Translate(wxWindow *window, WXMSG *msg) const;
 
 private:
     bool Translate(wxWindow *window, WXMSG *msg) const;
 
 private: