From fa8cefef63feb1d559c40db3cf9407e5bd1ac4df Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sun, 3 Nov 2002 10:07:16 +0000
Subject: add an OBDisplay class and the old ScreenInfo class to the toolkit.
 wrap the toolkit in the 'otk' namespace it compiles. broke the timer cache
 tho.

---
 otk/texture.hh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'otk/texture.hh')

diff --git a/otk/texture.hh b/otk/texture.hh
index 514a0584..d887a337 100644
--- a/otk/texture.hh
+++ b/otk/texture.hh
@@ -4,10 +4,13 @@
 
 #include "color.hh"
 #include "util.hh"
-class BImageControl;
 
 #include <string>
 
+namespace otk {
+
+class BImageControl;
+
 class BTexture {
 public:
   enum Type {
@@ -42,10 +45,8 @@ public:
     Interlaced          = (1l<<18)
   };
 
-  BTexture(const BaseDisplay * const _display = 0,
-           unsigned int _screen = ~(0u), BImageControl* _ctrl = 0);
+  BTexture(unsigned int _screen = ~(0u), BImageControl* _ctrl = 0);
   BTexture(const std::string &_description,
-           const BaseDisplay * const _display = 0,
            unsigned int _screen = ~(0u), BImageControl* _ctrl = 0);
 
   void setColor(const BColor &_color);
@@ -69,10 +70,8 @@ public:
   inline bool operator!=(const BTexture &tt)
   { return (! operator==(tt)); }
 
-  const BaseDisplay *display(void) const { return dpy; }
   unsigned int screen(void) const { return scrn; }
-  void setDisplay(const BaseDisplay * const _display,
-                  const unsigned int _screen);
+  void setScreen(const unsigned int _screen);
   void setImageControl(BImageControl* _ctrl) { ctrl = _ctrl; }
   const std::string &description(void) const { return descr; }
   void setDescription(const std::string &d);
@@ -84,9 +83,10 @@ private:
   BColor c, ct, lc, sc, bc;
   std::string descr;
   unsigned long t;
-  const BaseDisplay *dpy;
   BImageControl *ctrl;
   unsigned int scrn;
 };
 
+}
+
 #endif // TEXTURE_HH
-- 
cgit v1.2.3