X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba7499ef2fa8d10de42491d68945ce6c28575b12..ec75d791f043b3b43cac9825a2c62e9d5321e616:/include/wx/mac/accel.h diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h index fd7d76e277..da205da2c8 100644 --- a/include/wx/mac/accel.h +++ b/include/wx/mac/accel.h @@ -12,7 +12,7 @@ #ifndef _WX_ACCEL_H_ #define _WX_ACCEL_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "accel.h" #endif @@ -24,24 +24,30 @@ class WXDLLEXPORT wxAcceleratorTable: public wxObject DECLARE_DYNAMIC_CLASS(wxAcceleratorTable) public: wxAcceleratorTable(); - wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array + wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array // Copy constructors - inline wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); } - inline wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); } + wxAcceleratorTable(const wxAcceleratorTable& accel) + : wxObject() + { Ref(accel); } + wxAcceleratorTable(const wxAcceleratorTable* accel) + { if (accel) Ref(*accel); } ~wxAcceleratorTable(); - inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if (*this == accel) return (*this); Ref(accel); return *this; } - inline bool operator == (const wxAcceleratorTable& accel) { return m_refData == accel.m_refData; } - inline bool operator != (const wxAcceleratorTable& accel) { return m_refData != accel.m_refData; } + wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) + { if (*this == accel) return (*this); Ref(accel); return *this; } + bool operator == (const wxAcceleratorTable& accel) + { return m_refData == accel.m_refData; } + bool operator != (const wxAcceleratorTable& accel) + { return m_refData != accel.m_refData; } bool Ok() const; int GetCommand( wxKeyEvent &event ); }; -WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +// WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; #endif // _WX_ACCEL_H_