Fix compilation errors with G++

src/gfx/pixman/pixman-region.c

@@ -63,11 +63,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#if 0
 #include <stdlib.h>
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
-#if 0
+
 #include "pixman-private.h"
 #endif
 

src/gfx/region.cpp

@@ -11,6 +11,11 @@
 #include <limits>
 #include <cassert>
 
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+#include <stdio.h>
+
 // Anonymous namespace to include pixman-region.c. Macros doesn't respect
 // namespaces but anyway they are defined inside it just for reference
 // (to know that they are needed only for pixman-region.c).

src/gfx/region.h

@@ -41,6 +41,8 @@ namespace gfx {
     template<typename T>
     class RegionIterator : public std::iterator<std::forward_iterator_tag, T> {
     public:
+      typedef typename std::iterator<std::forward_iterator_tag, T>::reference reference;
+
       RegionIterator() : m_ptr(NULL) { }
       RegionIterator(const RegionIterator& o) : m_ptr(o.m_ptr) { }
       template<typename T2>

src/skin/skin_button.h

@@ -45,19 +45,19 @@ public:
     m_partNormal = partNormal;
     m_partHot = partHot;
     m_partSelected = partSelected;
-    invalidate();
+    Base::invalidate();
   }
 
 protected:
   void onPaint(ui::PaintEvent& ev) OVERRIDE {
-    gfx::Rect bounds(getClientBounds());
-    Graphics* g = ev.getGraphics();
-    SkinTheme* theme = static_cast<SkinTheme*>(getTheme());
+    gfx::Rect bounds(Base::getClientBounds());
+    ui::Graphics* g = ev.getGraphics();
+    SkinTheme* theme = static_cast<SkinTheme*>(Base::getTheme());
     SkinPart part;
 
-    if (isSelected())
+    if (Base::isSelected())
       part = m_partSelected;
-    else if (hasMouseOver())
+    else if (Base::hasMouseOver())
       part = m_partHot;
     else
       part = m_partNormal;