X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa03793d3bf2b76a753483ddf12abfd35eebe7a0..6a8b0d458663e48152afcf6576a057f5b8ab8be3:/include/wx/generic/accel.h?ds=sidebyside diff --git a/include/wx/generic/accel.h b/include/wx/generic/accel.h index bdd4ff8a85..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; }