X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Ftruerendercontrol.hh;h=a1bc47dcc2e8c467d0113da2e6f9780a5f5f106b;hb=555facb9c737be20cd923abc15875af0281a8927;hp=64559d12e8e00d3c6f0382a86be9ab33f71c44bd;hpb=edcbed448ef2d341edbca47e938b4e86673a99a0;p=chaz%2Fopenbox

diff --git a/otk/truerendercontrol.hh b/otk/truerendercontrol.hh
index 64559d12..a1bc47dc 100644
--- a/otk/truerendercontrol.hh
+++ b/otk/truerendercontrol.hh
@@ -4,30 +4,10 @@
 
 #include "rendercontrol.hh"
 
-extern "C" {
-
-#ifdef HAVE_STDINT_H
-#  include <stdint.h>
-#else
-#  ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#  endif
-#endif
-
-}
-
 #include <vector>
 
 namespace otk {
 
-#ifdef HAVE_STDINT_H
-typedef uint32_t pixel32;
-typedef uint16_t pixel16;
-#else
-typedef u_int32_t pixel32;
-typedef u_int16_t pixel16;
-#endif
-
 class TrueRenderControl : public RenderControl {
 private:
   // the number of bits to shift a color value (from 0-255) to the right, to
@@ -41,22 +21,19 @@ private:
   int _green_offset;
   int _blue_offset;
 
+  inline void highlight(pixel32 *x, pixel32 *y, bool raised) const;
+  void reduceDepth(Surface &sf, XImage *im) const;
+  void verticalGradient(Surface &sf, const RenderTexture &texture) const;
+  void diagonalGradient(Surface &sf, const RenderTexture &texture) const;
+  void crossDiagonalGradient(Surface &sf, const RenderTexture &texture) const;
+  virtual void drawGradientBackground(Surface &sf,
+                                      const RenderTexture &texture) const;
+  
 public:
   TrueRenderControl(int screen);
   virtual ~TrueRenderControl();
 
   virtual void drawBackground(Surface& sf, const RenderTexture &texture) const;
-  virtual void drawGradientBackground(Surface &sf,
-                                      const RenderTexture &texture) const;
-
-  inline void highlight(pixel32 *x, pixel32 *y, bool raised) const;
-  void reduceDepth(XImage *im, pixel32 *data) const;
-  void verticalGradient(Surface &sf, const RenderTexture &texture,
-                        pixel32 *data) const;
-  void diagonalGradient(Surface &sf, const RenderTexture &texture,
-                        pixel32 *data) const;
-  void crossDiagonalGradient(Surface &sf, const RenderTexture &texture,
-                        pixel32 *data) const;
 };
 
 }