projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[wxWidgets.git]
/
include
/
wx
/
gtk
/
accel.h
diff --git
a/include/wx/gtk/accel.h
b/include/wx/gtk/accel.h
index 44bfd043aed641858973833421619c80fdbcc2c4..4066849bea7d88c4acdce2b7fd182f0f4a21803a 100644
(file)
--- a/
include/wx/gtk/accel.h
+++ b/
include/wx/gtk/accel.h
@@
-1,9
+1,8
@@
/////////////////////////////////////////////////////////////////////////////
// Name: accel.h
// Purpose: wxAcceleratorTable class
/////////////////////////////////////////////////////////////////////////////
// Name: accel.h
// Purpose: wxAcceleratorTable class
-// Author: Robert
-// Modified by:
-// RCS-ID:
+// Author: Robert Roebling
+// RCS-ID: $Id$
// Copyright: (c) Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-16,6
+15,9
@@
#endif
#include "wx/defs.h"
#endif
#include "wx/defs.h"
+
+#if wxUSE_ACCEL
+
#include "wx/object.h"
#include "wx/event.h"
#include "wx/object.h"
#include "wx/event.h"
@@
-52,7
+54,7
@@
extern wxAcceleratorTable wxNullAcceleratorTable;
// wxAcceleratorEntry
//-----------------------------------------------------------------------------
// wxAcceleratorEntry
//-----------------------------------------------------------------------------
-class wxAcceleratorEntry
+class wxAcceleratorEntry
: public wxObject
{
public:
{
public:
@@
-84,16
+86,16
@@
class wxAcceleratorTable: public wxObject
wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
~wxAcceleratorTable();
wxAcceleratorTable(int n, wxAcceleratorEntry entries[] );
~wxAcceleratorTable();
- inline wxAcceleratorTable(const wxAcceleratorTable& accel)
+ inline wxAcceleratorTable(const wxAcceleratorTable& accel)
: wxObject()
{ Ref(accel); }
inline wxAcceleratorTable(const wxAcceleratorTable* accel)
{ if (accel) Ref(*accel); }
{ Ref(accel); }
inline wxAcceleratorTable(const wxAcceleratorTable* accel)
{ if (accel) Ref(*accel); }
- inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
- { if (*this == accel) return (*this); Ref(accel); return *this; }
- inline bool operator == (const wxAcceleratorTable& accel)
+ inline bool operator == (const wxAcceleratorTable& accel)
{ return m_refData == accel.m_refData; }
inline bool operator != (const wxAcceleratorTable& accel)
{ return m_refData != accel.m_refData; }
{ return m_refData == accel.m_refData; }
inline bool operator != (const wxAcceleratorTable& accel)
{ return m_refData != accel.m_refData; }
+ inline wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
+ { if (*this == accel) return (*this); Ref(accel); return *this; }
bool Ok() const;
bool Ok() const;
@@
-104,3
+106,5
@@
class wxAcceleratorTable: public wxObject
};
#endif
};
#endif
+
+#endif