dont use a const_iterator

[chaz/openbox] / otk / truerendercontrol.hh

diff --git a/otk/truerendercontrol.hh b/otk/truerendercontrol.hh
index fe79c003d28d56f93b4ca3ce8b258905b4b64612..e4975aeb002250478753faf1fbcbae5eb93b02ca 100644 (file)
--- a/otk/truerendercontrol.hh
+++ b/otk/truerendercontrol.hh
@@ -4,18 +4,48 @@
 
 #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;
+#else
+typedef u_int32_t pixel32;
+#endif
+
 class TrueRenderControl : public RenderControl {
 private:
+  // the number of bits to shift a color value (from 0-255) to the right, to
+  // fit it into the the color mask (do this before the offset)
+  int _red_shift;
+  int _green_shift;
+  int _blue_shift;
+
   // the offset of each color in a color mask
   int _red_offset;
   int _green_offset;
   int _blue_offset;
 
 public:
-  TrueRenderControl(const ScreenInfo *screen);
+  TrueRenderControl(int screen);
   virtual ~TrueRenderControl();
+
+  virtual void drawBackground(Surface& sf, const RenderTexture &texture) const;
+  virtual void drawGradientBackground(Surface &sf,
+                                      const RenderTexture &texture) const;
 };
 
 }