X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d84afea9d1ec41ee4e2ebb3bf6b87926cf5f04d1..f114b8580b980c54e7b6194fe6494a86cb833907:/include/wx/mac/accel.h diff --git a/include/wx/mac/accel.h b/include/wx/mac/accel.h index 3586e6cefb..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,7 +24,7 @@ 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 wxAcceleratorTable(const wxAcceleratorTable& accel) @@ -47,7 +47,7 @@ public: int GetCommand( wxKeyEvent &event ); }; -WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +// WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; #endif // _WX_ACCEL_H_