git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix no more working extended event descriptions
[enigma2.git]
/
lib
/
actions
/
action.h
diff --git
a/lib/actions/action.h
b/lib/actions/action.h
index 560fdbbfc487a3734c6017f5e1aa7f0f5c6d4224..834dc2094dbbb146144d6e638a39245a11e30332 100644
(file)
--- a/
lib/actions/action.h
+++ b/
lib/actions/action.h
@@
-7,13
+7,13
@@
#include <features.h>
#undef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200112L
#include <features.h>
#undef _POSIX_C_SOURCE
#define _POSIX_C_SOURCE 200112L
-#include <Python.h>
#include <lib/python/python.h>
#include <string>
#include <map>
class eWidget;
#include <lib/python/python.h>
#include <string>
#include <map>
class eWidget;
+SWIG_IGNORE(eActionMap);
class eActionMap: public iObject
{
DECLARE_REF(eActionMap);
class eActionMap: public iObject
{
DECLARE_REF(eActionMap);
@@
-29,15
+29,15
@@
public:
void unbindAction(eWidget *widget, int id);
#endif
void unbindAction(eWidget *widget, int id);
#endif
- void bindAction(const std::string &context, int priority,
PyObject *
function);
- void unbindAction(const std::string &context,
PyObject *
function);
+ void bindAction(const std::string &context, int priority,
SWIG_PYOBJECT(ePyObject)
function);
+ void unbindAction(const std::string &context,
SWIG_PYOBJECT(ePyObject)
function);
void bindKey(const std::string &device, int key, int flags, const std::string &context, const std::string &action);
void keyPressed(const std::string &device, int key, int flags);
void bindKey(const std::string &device, int key, int flags, const std::string &context, const std::string &action);
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
@@
-45,7
+45,7
@@
private:
// eActionContext *m_context;
std::string m_context; // FIXME
// eActionContext *m_context;
std::string m_context; // FIXME
-
PyObject *
m_fnc;
+
ePyObject
m_fnc;
eWidget *m_widget;
int m_id;
eWidget *m_widget;
int m_id;
@@
-79,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