X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21aeca5e542b8f38d58c6308fdf0e94a4e9671a6..fc5414a1c6c55fcf9fd7f5bffb09b9b9eaf1d4bf:/include/wx/generic/accel.h?ds=sidebyside diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h index 76e2f9369c..1d05a92a99 100644 --- a/include/wx/generic/accel.h +++ b/include/wx/generic/accel.h @@ -10,7 +10,7 @@ #ifndef _WX_GENERIC_ACCEL_H_ #define _WX_GENERIC_ACCEL_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "accel.h" #endif @@ -24,11 +24,12 @@ class WXDLLEXPORT wxAcceleratorTable : public wxObject { public: wxAcceleratorTable(); - wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); + wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); virtual ~wxAcceleratorTable(); wxAcceleratorTable(const wxAcceleratorTable& accel) - { Ref(accel); } + : wxObject() + { Ref(accel); } wxAcceleratorTable& operator=(const wxAcceleratorTable& accel) { if ( m_refData != accel.m_refData ) Ref(accel); return *this; } @@ -50,6 +51,11 @@ public: 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) };