Swift
summaryrefslogtreecommitdiffstats
path: root/Slimber/Cocoa/CocoaMenulet.h
diff options
context:
space:
mode:
Diffstat (limited to 'Slimber/Cocoa/CocoaMenulet.h')
-rw-r--r--Slimber/Cocoa/CocoaMenulet.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/Slimber/Cocoa/CocoaMenulet.h b/Slimber/Cocoa/CocoaMenulet.h
index fa4848e..887fdf9 100644
--- a/Slimber/Cocoa/CocoaMenulet.h
+++ b/Slimber/Cocoa/CocoaMenulet.h
@@ -1,24 +1,22 @@
1/* 1/*
2 * Copyright (c) 2010-2012 Isode Limited. 2 * Copyright (c) 2010-2015 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
6 6
7#pragma once 7#pragma once
8 8
9// Fix Boost-Cocoa conflict
10#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
11#include <Cocoa/Cocoa.h> 9#include <Cocoa/Cocoa.h>
10#include <Slimber/Menulet.h>
12 11
13#include "Slimber/Menulet.h"
14#include <SwifTools/Cocoa/CocoaAction.h> 12#include <SwifTools/Cocoa/CocoaAction.h>
15 13
16class CocoaMenulet : public Menulet { 14class CocoaMenulet : public Menulet {
17 public: 15 public:
18 CocoaMenulet(); 16 CocoaMenulet();
19 ~CocoaMenulet(); 17 virtual ~CocoaMenulet();
20 18
21 private: 19 private:
22 virtual void clear(); 20 virtual void clear();
23 virtual void addItem(const std::string& name, const std::string& icon); 21 virtual void addItem(const std::string& name, const std::string& icon);
24 virtual void addSeparator(); 22 virtual void addSeparator();