projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed typo.
[wxWidgets.git]
/
include
/
wx
/
accel.h
diff --git
a/include/wx/accel.h
b/include/wx/accel.h
index ee2e3a08ad5817f4a1d8bf0cde92183a1038de97..65b9a182f6f96f16f46e7ccd22693a007747fe0f 100644
(file)
--- a/
include/wx/accel.h
+++ b/
include/wx/accel.h
@@
-27,7
+27,7
@@
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
// ----------------------------------------------------------------------------
// wxAcceleratorEntry flags
// ----------------------------------------------------------------------------
// wxAcceleratorEntry flags
-enum
+enum
wxAcceleratorEntryFlags
{
wxACCEL_NORMAL = 0x0000, // no modifiers
wxACCEL_ALT = 0x0001, // hold Alt key down
{
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
// ----------------------------------------------------------------------------
// an entry in wxAcceleratorTable corresponds to one accelerator
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxAcceleratorEntry
+class WXDLL
IMPEXP_CORE
wxAcceleratorEntry
{
public:
wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0,
{
public:
wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0,
@@
-107,8
+107,7
@@
public:
bool IsOk() const
{
bool IsOk() const
{
- return m_flags != 0 &&
- m_keyCode != 0;
+ return m_keyCode != 0;
}
}
@@
-157,14
+156,14
@@
private:
#elif defined(__WXGTK__)
#include "wx/gtk1/accel.h"
#elif defined(__WXMAC__)
#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
#elif defined(__WXCOCOA__)
#include "wx/generic/accel.h"
#elif defined(__WXPM__)
#include "wx/os2/accel.h"
#endif
-extern WXDLL
EXPORT_DATA
(wxAcceleratorTable) wxNullAcceleratorTable;
+extern WXDLL
IMPEXP_DATA_CORE
(wxAcceleratorTable) wxNullAcceleratorTable;
#endif // wxUSE_ACCEL
#endif // wxUSE_ACCEL