Applied patch [ 1445031 ] wxString passed as ellipsis argument in richtexthtml.cpp

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

diff --git a/include/wx/msw/accel.h b/include/wx/msw/accel.h
index 26831188f4304d97becdfbe4ce983f5a4d3a0b81..ee7dc5dc321ac83ecc60b766005e3b02cbac02a1 100644 (file)
--- a/include/wx/msw/accel.h
+++ b/include/wx/msw/accel.h
@@ -12,10 +12,6 @@
 #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
-

 // ----------------------------------------------------------------------------
 // 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 +20,7 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     // default ctor
 {
 public:
     // default ctor

-    wxAcceleratorTable();
-
-    // copy ctor
-    wxAcceleratorTable(const wxAcceleratorTable& accel) : wxObject(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,17 +28,9 @@ 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; }
-
-// #if WXWIN_COMPATIBILITY_2_4
-// fixme: it is still used in 'operator =' above
-    bool operator==(const wxAcceleratorTable& accel) const
-        { return m_refData == accel.m_refData; }
+    bool operator==(const wxAcceleratorTable& accel) const;

     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }
     bool operator!=(const wxAcceleratorTable& accel) const
         { return !(*this == accel); }

-// #endif

 
     bool Ok() const;
     void SetHACCEL(WXHACCEL hAccel);
 
     bool Ok() const;
     void SetHACCEL(WXHACCEL hAccel);