X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/162e998c2f15f8773cbb63f0cceee8cdea4c421f..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/accel.h diff --git a/include/wx/accel.h b/include/wx/accel.h index ee2e3a08ad..6d0e2701ea 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, @@ -107,8 +107,7 @@ public: bool IsOk() const { - return m_flags != 0 && - m_keyCode != 0; + return m_keyCode != 0; } @@ -117,7 +116,7 @@ public: // returns a wxString for the this accelerator. // this function formats it using the - format - // where maybe a hyphen-separed list of "shift|alt|ctrl" + // where maybe a hyphen-separated list of "shift|alt|ctrl" wxString ToString() const; // returns true if the given string correctly initialized this object @@ -157,14 +156,14 @@ private: #elif defined(__WXGTK__) #include "wx/gtk1/accel.h" #elif defined(__WXMAC__) - #include "wx/mac/accel.h" + #include "wx/osx/accel.h" #elif defined(__WXCOCOA__) #include "wx/generic/accel.h" #elif defined(__WXPM__) #include "wx/os2/accel.h" #endif -extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable; +extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable; #endif // wxUSE_ACCEL