Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 6 insertions, 0 deletions

diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh
index fdcfe9c..6c9d419 100644
--- a/src/FbTk/EventManager.hh
+++ b/src/FbTk/EventManager.hh
@@ -19,6 +19,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+#ifndef FBTK_EVENTMANAGER_HH
+#define FBTK_EVENTMANAGER_HH
+
 #include <map>
 #include <X11/Xlib.h>
 
@@ -66,3 +69,6 @@ private:
 };
 
 } //end namespace FbTk
+
+#endif // FBTK_EVENTMANAGER_HH
+