include the all otk stuff into the openbox python module. rename widget.hh to stop...

[chaz/openbox] / src / client.hh

diff --git a/src/client.hh b/src/client.hh
index 6e93337bf89dcabb0403209ddaaed71289d5292c..6cafb94326ca05b30bc8906eb8fee67eff8fbdc5 100644 (file)
--- a/src/client.hh
+++ b/src/client.hh
@@ -7,7 +7,7 @@
   property changes on the window and some client messages
 */
 
-#include "widget.hh"
+#include "widgetbase.hh"
 #include "otk/point.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
@@ -364,6 +364,16 @@ private:
 
   //! Change the client's state hints to match the class' data
   void changeState();
+
+  //! Request the client to close its window.
+  void close();
+
+  //! Shades or unshades the client window
+  /*!
+    @param shade true if the window should be shaded; false if it should be
+                 unshaded.
+  */
+  void shade(bool shade);
   
 public:
 #ifndef SWIG
@@ -454,8 +464,7 @@ BB    @param window The window id that the OBClient class should handle
   inline bool modal() const { return _modal; }
   //! Returns if the window is shaded
   /*!
-    When the window is shaded, only its titlebar is visible, the client itself
-    is not mapped
+    When the window is shaded, only its titlebar is visible.
   */
   inline bool shaded() const { return _shaded; }
   //! Returns if the window is iconified
@@ -503,21 +512,11 @@ BB    @param window The window id that the OBClient class should handle
   */
   void resize(Corner anchor, int w, int h, int x = INT_MIN, int y = INT_MIN);
 
-  //! Request the client to close its window.
-  void close();
-
-  //! Shades or unshades the client window
-  /*!
-    @param shade true if the window should be shaded; false if it should be
-                 unshaded.
-  */
-  void shade(bool shade);
-  
   //! Attempt to focus the client window
-  bool focus();
+  bool focus() const;
 
   //! Remove focus from the client window
-  void unfocus();
+  void unfocus() const;
 
   virtual void focusHandler(const XFocusChangeEvent &e);
   virtual void unfocusHandler(const XFocusChangeEvent &e);