projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made all bitmaps 16x16
[wxWidgets.git]
/
src
/
motif
/
accel.cpp
diff --git
a/src/motif/accel.cpp
b/src/motif/accel.cpp
index 230b9fb6c5290b075063a42e213559c312c70a01..1a2f7fd39356342f7be3588e07e7b71a5ec396c3 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,17
+9,16
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "accel.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// 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>
IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
#include <ctype.h>
IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
@@
-29,7
+28,7
@@
class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
friend class WXDLLEXPORT wxAcceleratorTable;
public:
wxAcceleratorRefData();
friend class WXDLLEXPORT wxAcceleratorTable;
public:
wxAcceleratorRefData();
- ~wxAcceleratorRefData();
+
virtual
~wxAcceleratorRefData();
public:
int m_count;
public:
int m_count;
@@
-81,7
+80,7
@@
wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
}
}
-bool wxAcceleratorTable::Ok() const
+bool wxAcceleratorTable::
Is
Ok() const
{
return (m_refData != (wxAcceleratorRefData*) NULL);
}
{
return (m_refData != (wxAcceleratorRefData*) NULL);
}
@@
-116,4
+115,3
@@
bool wxAcceleratorEntry::MatchesEvent(const wxKeyEvent& event) const
(eventShiftDown == accShiftDown) &&
((eventKeyCode == accKeyCode || eventKeyCode == accKeyCode2))) ;
}
(eventShiftDown == accShiftDown) &&
((eventKeyCode == accKeyCode || eventKeyCode == accKeyCode2))) ;
}
-