projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct painting of the items with custom colours in TVIS_DROPHILITED state (patch...
[wxWidgets.git]
/
src
/
motif
/
accel.cpp
diff --git
a/src/motif/accel.cpp
b/src/motif/accel.cpp
index 1a24c747b202352e97c8d69db4c7b02ba8112a81..e3d7e23be39256abf251e7416e7bd9484839df37 100644
(file)
--- a/
src/motif/accel.cpp
+++ b/
src/motif/accel.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: accel.cpp
+// Name:
src/motif/
accel.cpp
// Purpose: wxAcceleratorTable
// Author: Julian Smart
// Modified by:
// Purpose: wxAcceleratorTable
// Author: Julian Smart
// Modified by:
@@
-9,19
+9,19
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "accel.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#include "wx/setup.h"
#include "wx/accel.h"
#include "wx/accel.h"
-#include "wx/string.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/string.h"
+ #include "wx/utils.h"
+#endif
+
#include <ctype.h>
#include <ctype.h>
-#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
-#endif
class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
{
class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
{
@@
-67,7
+67,7
@@
wxAcceleratorTable::wxAcceleratorTable(const wxString& WXUNUSED(resource))
}
// Create from an array
}
// Create from an array
-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n,
const
wxAcceleratorEntry entries[])
{
wxAcceleratorRefData* data = new wxAcceleratorRefData;
m_refData = data;
{
wxAcceleratorRefData* data = new wxAcceleratorRefData;
m_refData = data;
@@
-101,7
+101,7
@@
bool wxAcceleratorEntry::MatchesEvent(const wxKeyEvent& event) const
bool eventAltDown = event.AltDown();
bool eventCtrlDown = event.ControlDown();
bool eventShiftDown = event.ShiftDown();
bool eventAltDown = event.AltDown();
bool eventCtrlDown = event.ControlDown();
bool eventShiftDown = event.ShiftDown();
- int eventKeyCode = event.KeyCode();
+ int eventKeyCode = event.
Get
KeyCode();
bool accAltDown = ((GetFlags() & wxACCEL_ALT) == wxACCEL_ALT);
bool accCtrlDown = ((GetFlags() & wxACCEL_CTRL) == wxACCEL_CTRL);
bool accAltDown = ((GetFlags() & wxACCEL_ALT) == wxACCEL_ALT);
bool accCtrlDown = ((GetFlags() & wxACCEL_CTRL) == wxACCEL_CTRL);
@@
-115,4
+115,3
@@
bool wxAcceleratorEntry::MatchesEvent(const wxKeyEvent& event) const
(eventShiftDown == accShiftDown) &&
((eventKeyCode == accKeyCode || eventKeyCode == accKeyCode2))) ;
}
(eventShiftDown == accShiftDown) &&
((eventKeyCode == accKeyCode || eventKeyCode == accKeyCode2))) ;
}
-