git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whitespace fixes
[enigma2.git]
/
lib
/
actions
/
action.h
diff --git
a/lib/actions/action.h
b/lib/actions/action.h
index f2e0d8f460d5730374f7fcdde3613c7e32f66900..834dc2094dbbb146144d6e638a39245a11e30332 100644
(file)
--- a/
lib/actions/action.h
+++ b/
lib/actions/action.h
@@
-13,6
+13,7
@@
class eWidget;
class eWidget;
+SWIG_IGNORE(eActionMap);
class eActionMap: public iObject
{
DECLARE_REF(eActionMap);
class eActionMap: public iObject
{
DECLARE_REF(eActionMap);
@@
-35,8
+36,8
@@
public:
void keyPressed(const std::string &device, int key, int flags);
void keyPressed(const std::string &device, int key, int flags);
- static RESULT getInstance(ePtr<eActionMap> &ptr);
#ifndef SWIG
#ifndef SWIG
+ static RESULT getInstance(ePtr<eActionMap> &);
private:
static eActionMap *instance;
struct eActionBinding
private:
static eActionMap *instance;
struct eActionBinding
@@
-78,5
+79,13
@@
private:
std::multimap<std::string, ePythonKeyBinding> m_python_keys;
#endif
};
std::multimap<std::string, ePythonKeyBinding> m_python_keys;
#endif
};
+SWIG_TEMPLATE_TYPEDEF(ePtr<eActionMap>, eActionMap);
+SWIG_EXTEND(ePtr<eActionMap>,
+ static ePtr<eActionMap> getInstance()
+ {
+ extern ePtr<eActionMap> NewActionMapPtr(void);
+ return NewActionMapPtr();
+ }
+);
#endif
#endif