removing old Makefile.in, rolling back Makefile.am to before the mappable muse button...

[chaz/openbox] / src / Window.hh

diff --git a/src/Window.hh b/src/Window.hh
index aab1a412778d049e1ea9d7296316d6c42ff939ce..0f3fb14d3cf25df166f906629bcefc3b3c040e90 100644 (file)
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -282,13 +282,14 @@ private:
   void destroyIconifyButton(void);
   void createMaximizeButton(void);
   void destroyMaximizeButton(void);
-  void redrawLabel(void);
-  void redrawAllButtons(void);
-  void redrawCloseButton(bool pressed);
-  void redrawIconifyButton(bool pressed);
-  void redrawMaximizeButton(bool pressed);
-  void restoreGravity(void);
-  void setGravityOffsets(void);
+  void redrawWindowFrame(void) const;
+  void redrawLabel(void) const;
+  void redrawAllButtons(void) const;
+  void redrawCloseButton(bool pressed) const;
+  void redrawIconifyButton(bool pressed) const;
+  void redrawMaximizeButton(bool pressed) const;
+  void applyGravity(Rect &r);
+  void restoreGravity(Rect &r);
   void setAllowedActions(void);
   void setState(unsigned long new_state);
   void upsize(void);
@@ -386,16 +387,16 @@ public:
   void changeBlackboxHints(BlackboxHints *net);
   void restoreAttributes(void);
 
-  void buttonPressEvent(XButtonEvent *be);
-  void buttonReleaseEvent(XButtonEvent *re);
-  void motionNotifyEvent(XMotionEvent *me);
-  void destroyNotifyEvent(XDestroyWindowEvent */*unused*/);
-  void mapRequestEvent(XMapRequestEvent *mre);
-  void unmapNotifyEvent(XUnmapEvent */*unused*/);
-  void reparentNotifyEvent(XReparentEvent */*unused*/);
+  void buttonPressEvent(const XButtonEvent *be);
+  void buttonReleaseEvent(const XButtonEvent *re);
+  void motionNotifyEvent(const XMotionEvent *me);
+  void destroyNotifyEvent(const XDestroyWindowEvent */*unused*/);
+  void mapRequestEvent(const XMapRequestEvent *mre);
+  void unmapNotifyEvent(const XUnmapEvent */*unused*/);
+  void reparentNotifyEvent(const XReparentEvent */*unused*/);
   void propertyNotifyEvent(Atom atom);
-  void exposeEvent(XExposeEvent *ee);
-  void configureRequestEvent(XConfigureRequestEvent *cr);
+  void exposeEvent(const XExposeEvent *ee);
+  void configureRequestEvent(const XConfigureRequestEvent *cr);
 
 #ifdef    SHAPE
   void configureShape(void);