From 2c89ce8f600fd1c677eac4af271487c35a4c7375 Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Mon, 13 May 2013 20:05:21 +0300
Subject: [PATCH] Backport Mac OS X build fix

---
 include/platform/wxwidgets/scrollbar.hpp | 1 +
 src/platform/wxwidgets/textrender.cpp    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/include/platform/wxwidgets/scrollbar.hpp b/include/platform/wxwidgets/scrollbar.hpp
index 2af0c65c..a726c3c7 100644
--- a/include/platform/wxwidgets/scrollbar.hpp
+++ b/include/platform/wxwidgets/scrollbar.hpp
@@ -2,6 +2,7 @@
 #define _scrollbar__hpp__defined__
 
 #include <wx/scrolbar.h>
+#include <functional>
 
 class scroll_bar : public wxScrollBar
 {
diff --git a/src/platform/wxwidgets/textrender.cpp b/src/platform/wxwidgets/textrender.cpp
index ef6ec4a9..ec3bbd30 100644
--- a/src/platform/wxwidgets/textrender.cpp
+++ b/src/platform/wxwidgets/textrender.cpp
@@ -3,6 +3,7 @@
 #include "library/utf8.hpp"
 #include <wx/dc.h>
 #include <wx/dcclient.h>
+#include <wx/image.h>
 
 extern const uint32_t text_framebuffer::element::white = 0xFFFFFF;
 extern const uint32_t text_framebuffer::element::black = 0x000000;