X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fimage.hh;h=da489323af7e7d1112511d9dbf70d965b0a0a89e;hb=bf404e092be46801b1a78f9a71e10d0d00b75894;hp=ed99e12492b896f776a1f273a4903c6c25dca0c3;hpb=9259ec5732851dd66f7c598d629e3808ac7ab3d8;p=chaz%2Fopenbox

diff --git a/otk/image.hh b/otk/image.hh
index ed99e124..da489323 100644
--- a/otk/image.hh
+++ b/otk/image.hh
@@ -68,15 +68,17 @@ public:
 
 class BImageControl {
 public:
+#ifndef SWIG
   struct CachedImage {
     Pixmap pixmap;
 
     unsigned int count, width, height;
     unsigned long pixel1, pixel2, texture;
   };
+#endif
 
-  BImageControl(OBTimerQueueManager *timermanager,
-                const ScreenInfo *scrn,
+  BImageControl(otk::OBTimerQueueManager *timermanager,
+                const otk::ScreenInfo *scrn,
                 bool _dither= False, int _cpc = 4,
                 unsigned long cache_timeout = 300000l,
                 unsigned long cmax = 200l);
@@ -88,7 +90,7 @@ public:
 
   inline Window getDrawable(void) const { return window; }
 
-  inline Visual *getVisual(void) { return screeninfo->getVisual(); }
+  inline Visual *getVisual(void) { return screeninfo->visual(); }
 
   inline int getBitsPerPixel(void) const { return bits_per_pixel; }
   inline int getDepth(void) const { return screen_depth; }
@@ -98,7 +100,7 @@ public:
   unsigned long getSqrt(unsigned int x);
 
   Pixmap renderImage(unsigned int width, unsigned int height,
-                     const BTexture &texture);
+                     const otk::BTexture &texture);
 
   void installRootColormap(void);
   void removeImage(Pixmap pixmap);