git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enigma2-{Network,NetworkWizard,WirelessLan}: more work on wireless lan / networking...
[enigma2.git]
/
lib
/
actions
/
action.h
diff --git
a/lib/actions/action.h
b/lib/actions/action.h
index f0a6ee49a4083949e536fc1b1fa8790e9dc78b99..edcfac6f01224b93114372a8b90303c91514cc2a 100644
(file)
--- a/
lib/actions/action.h
+++ b/
lib/actions/action.h
@@
-3,10
+3,6
@@
#include <lib/base/object.h>
#include <lib/base/object.h>
- /* avoid warnigs :) */
-#include <features.h>
-#undef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200112L
#include <lib/python/python.h>
#include <string>
#include <map>
#include <lib/python/python.h>
#include <string>
#include <map>
@@
-16,7
+12,7
@@
class eWidget;
SWIG_IGNORE(eActionMap);
class eActionMap: public iObject
{
SWIG_IGNORE(eActionMap);
class eActionMap: public iObject
{
-DECLARE_REF(eActionMap);
+
DECLARE_REF(eActionMap);
#ifdef SWIG
eActionMap();
~eActionMap();
#ifdef SWIG
eActionMap();
~eActionMap();
@@
-43,6
+39,9
@@
private:
static eActionMap *instance;
struct eActionBinding
{
static eActionMap *instance;
struct eActionBinding
{
+ eActionBinding()
+ :m_prev_seen_make_key(-1)
+ {}
// eActionContext *m_context;
std::string m_context; // FIXME
std::string m_domain;
// eActionContext *m_context;
std::string m_context; // FIXME
std::string m_domain;
@@
-51,6
+50,7
@@
private:
eWidget *m_widget;
int m_id;
eWidget *m_widget;
int m_id;
+ int m_prev_seen_make_key;
};
std::multimap<int, eActionBinding> m_bindings;
};
std::multimap<int, eActionBinding> m_bindings;