sync with bb-cvs: re-add support for alt-button2, fix some off by 2's temorarily

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index 60418cd708eeb4ae569f2952a900c1545ba589ce..3ce57db3db03cfcea9e1f8ed619a907cdf575b9d 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -331,14 +331,13 @@ public:
   void save_rc(void);
   void reconfigure(void);
   void toggleFocusModel(FocusModel model);
-  void updateFocusModel(void);
   void rereadMenu(void);
   void shutdown(void);
   void showPosition(int x, int y);
   void showGeometry(unsigned int gx, unsigned int gy);
   void hideGeometry(void);
 
-  void buttonPressEvent(XButtonEvent *xbutton);
+  void buttonPressEvent(const XButtonEvent *xbutton);
 
   void updateNetizenCurrentWorkspace(void);
   void updateNetizenWorkspaceCount(void);