X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbbwindow.hh;h=8417d1bcde3d7523eba083642bb12d81fde1d415;hb=977ecf1f1e82f385a542648b545a0d0877febaf0;hp=29818b4387413daf7f5001bc25618307193286de;hpb=6f8b36ff823e0eeabc439d15255353516745e23f;p=chaz%2Fopenbox

diff --git a/src/bbwindow.hh b/src/bbwindow.hh
index 29818b43..8417d1bc 100644
--- a/src/bbwindow.hh
+++ b/src/bbwindow.hh
@@ -13,8 +13,11 @@ extern "C" {
 #include <string>
 
 #include "otk/timer.hh"
+#include "otk/property.hh"
+#include "otk/rect.hh"
+#include "otk/strut.hh"
 #include "blackbox.hh"
-#include "util.hh"
+#include "otk/util.hh"
 
 #define MwmHintsFunctions     (1l << 0)
 #define MwmHintsDecorations   (1l << 1)
@@ -104,7 +107,7 @@ public:
 private:
   Blackbox *blackbox;
   BScreen *screen;
-  XAtom *xatom;
+  otk::OBProperty *xatom;
   otk::OBTimer *timer;
   BlackboxAttributes blackbox_attrib;
 
@@ -147,7 +150,7 @@ private:
     std::string title, icon_title;
 
     otk::Rect rect;
-    Strut strut;
+    otk::Strut strut;
 
     int old_bw;                       // client's borderwidth
 
@@ -218,7 +221,7 @@ private:
     otk::Rect changing;
 
     otk::Rect rect;                  // frame geometry
-    Strut margin;               // margins between the frame and client
+    otk::Strut margin;               // margins between the frame and client
 
     int grab_x, grab_y;         // where was the window when it was grabbed?
 
@@ -381,7 +384,7 @@ public:
   void ungrabButtons(void);
   void installColormap(bool install);
   void restore(bool remap);
-  void configure(int dx, int dy, unsigned int dw, unsigned int dh);
+  void configure(int dx, int dy, int dw, int dh);
   void setWorkspace(unsigned int n);
   void changeBlackboxHints(const BlackboxHints *net);
   void restoreAttributes(void);