X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..6f8c67e71020cb3b7779b1267dda8702423e7c42:/include/wx/accel.h diff --git a/include/wx/accel.h b/include/wx/accel.h index ce47c83d2a..f7bf3b53fd 100644 --- a/include/wx/accel.h +++ b/include/wx/accel.h @@ -6,7 +6,7 @@ // Created: 31.05.01 (extracted from other files) // RCS-ID: $Id$ // Copyright: (c) wxWidgets team -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_ACCEL_H_BASE_ @@ -62,7 +62,7 @@ public: Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item); return *this; } - + void Set(int flags, int keyCode, int cmd, wxMenuItem *item = NULL) { m_flags = flags; @@ -94,7 +94,7 @@ public: // Implementation use only bool MatchesEvent(const wxKeyEvent& event) const; #endif - + private: int m_flags; // combination of wxACCEL_XXX constants int m_keyCode; // ASCII or virtual keycode @@ -128,7 +128,7 @@ private: #include "wx/os2/accel.h" #endif -WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable; +extern WXDLLEXPORT_DATA(wxAcceleratorTable) wxNullAcceleratorTable; #endif // wxUSE_ACCEL