adding wxArrayDouble for later use in graphics context APIs

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

diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h
index 76e2f9369ca7d31a8b004bd0a4b687642be030e0..5bcdf830996df4dc5686c3649f1aaac7f2fcf109 100644 (file)
--- a/include/wx/generic/accel.h
+++ b/include/wx/generic/accel.h
@@ -10,10 +10,6 @@
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 
 #ifndef _WX_GENERIC_ACCEL_H_
 #define _WX_GENERIC_ACCEL_H_
 

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

 class WXDLLEXPORT wxKeyEvent;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxKeyEvent;
 
 // ----------------------------------------------------------------------------


@@ -24,18 +20,15 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject
 {
 public:
     wxAcceleratorTable();
 {
 public:
     wxAcceleratorTable();

-    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]);
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]);

     virtual ~wxAcceleratorTable();
 
     virtual ~wxAcceleratorTable();
 

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

     bool operator==(const wxAcceleratorTable& accel) const
     bool operator==(const wxAcceleratorTable& accel) const

-        { return m_refData == accel.m_refData; } // FIXME: this is wrong (VZ)
+        { return m_refData == accel.m_refData; }

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

+#endif

 
     bool Ok() const;
 
 
     bool Ok() const;
 


@@ -50,6 +43,11 @@ public:
 
     const wxAcceleratorEntry *GetEntry(const wxKeyEvent& event) const;
 
 
     const wxAcceleratorEntry *GetEntry(const wxKeyEvent& event) const;
 

+protected:
+    // ref counting code
+    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 };