X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/162e998c2f15f8773cbb63f0cceee8cdea4c421f..e78c1d7855d1fefcdbff0e093e21e5cf101ca604:/include/wx/accel.h?ds=inline diff --git a/include/wx/accel.h b/include/wx/accel.h index ee2e3a08ad..fe1ec1a6fa 100644 --- a/include/wx/accel.h +++ b/include/wx/accel.h @@ -27,7 +27,7 @@ class WXDLLIMPEXP_FWD_CORE wxKeyEvent; // ---------------------------------------------------------------------------- // wxAcceleratorEntry flags -enum +enum wxAcceleratorEntryFlags { wxACCEL_NORMAL = 0x0000, // no modifiers wxACCEL_ALT = 0x0001, // hold Alt key down @@ -44,7 +44,7 @@ enum // an entry in wxAcceleratorTable corresponds to one accelerator // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAcceleratorEntry +class WXDLLIMPEXP_CORE wxAcceleratorEntry { public: wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0, @@ -164,7 +164,7 @@ private: #include "wx/os2/accel.h" #endif -extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable; +extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable; #endif // wxUSE_ACCEL