removing all prefixes completed

[chaz/openbox] / src / actions.hh

diff --git a/src/actions.hh b/src/actions.hh
index 970a18a49ab32b14e23c2079b42bcc81ac910b4c..603450e4c42cc9847d63507e26d276147dc30ad7 100644 (file)
--- a/src/actions.hh
+++ b/src/actions.hh
@@ -25,7 +25,7 @@ namespace ob {
   When these actions are fired, hooks to the guile engine are fired so that
   guile code is run.
 */
-class OBActions : public otk::OtkEventHandler {
+class Actions : public otk::EventHandler {
 public:
 #ifndef   SWIG // get rid of a swig warning
   struct ButtonReleaseAction {
@@ -60,13 +60,11 @@ private:
   void insertPress(const XButtonEvent &e);
   void removePress(const XButtonEvent &e);
 
-  PyObject *_callback[NUM_EVENTS];
-
 public:
-  //! Constructs an OBActions object
-  OBActions();
-  //! Destroys the OBActions object
-  virtual ~OBActions();
+  //! Constructs an Actions object
+  Actions();
+  //! Destroys the Actions object
+  virtual ~Actions();
 
   virtual void buttonPressHandler(const XButtonEvent &e);
   virtual void buttonReleaseHandler(const XButtonEvent &e);
@@ -82,14 +80,10 @@ public:
   virtual void unmapHandler(const XUnmapEvent &e);
   virtual void destroyHandler(const XDestroyWindowEvent &e);
 
-  //! Bind a callback for an action
-  bool bind(EventAction action, PyObject *func);
-
-  //! Unbind the callback function from an action
-  bool unbind(EventAction action);
+#ifdef    XKB
+  virtual void xkbHandler(const XkbEvent &e);
+#endif // XKB
 
-  //! Remove all callback functions
-  void unbindAll();
 };
 
 }