Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Slimber/Cocoa/CocoaController.h6
-rw-r--r--Slimber/Cocoa/CocoaController.mm14
-rw-r--r--Slimber/Cocoa/CocoaMenulet.h8
-rw-r--r--SwifTools/Dock/MacOSXDock.mm7
4 files changed, 21 insertions, 14 deletions
diff --git a/Slimber/Cocoa/CocoaController.h b/Slimber/Cocoa/CocoaController.h
index 8f42fbf..f6881ae 100644
--- a/Slimber/Cocoa/CocoaController.h
+++ b/Slimber/Cocoa/CocoaController.h
@@ -1,13 +1,13 @@
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// Fix Boost-Cocoa conflict 7#pragma once
8#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 8
9#include <Cocoa/Cocoa.h> 9#include <Cocoa/Cocoa.h>
10 10
11class MainController; 11class MainController;
12class CocoaMenulet; 12class CocoaMenulet;
13 13
diff --git a/Slimber/Cocoa/CocoaController.mm b/Slimber/Cocoa/CocoaController.mm
index 2ee350d..da1df98 100644
--- a/Slimber/Cocoa/CocoaController.mm
+++ b/Slimber/Cocoa/CocoaController.mm
@@ -1,10 +1,16 @@
1#include "Slimber/Cocoa/CocoaController.h" 1/*
2 * Copyright (c) 2015 Isode Limited.
3 * All rights reserved.
4 * See the COPYING file for more information.
5 */
2 6
3#include "Slimber/MainController.h" 7#include <Slimber/Cocoa/CocoaController.h>
4#include "Slimber/Cocoa/CocoaMenulet.h" 8
5#include "Slimber/Cocoa/main.h" 9#include <Slimber/MainController.h>
10#include <Slimber/Cocoa/CocoaMenulet.h>
11#include <Slimber/Cocoa/main.h>
6 12
7@implementation CocoaController { 13@implementation CocoaController {
8 CocoaMenulet* menulet; 14 CocoaMenulet* menulet;
9 MainController* main; 15 MainController* main;
10} 16}
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();
diff --git a/SwifTools/Dock/MacOSXDock.mm b/SwifTools/Dock/MacOSXDock.mm
index 3164998..8c196d8 100644
--- a/SwifTools/Dock/MacOSXDock.mm
+++ b/SwifTools/Dock/MacOSXDock.mm
@@ -1,7 +1,10 @@
1// Fix Boost-Cocoa conflict 1/*
2#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 2 * Copyright (c) 2015 Isode Limited.
3 * All rights reserved.
4 * See the COPYING file for more information.
5 */
3 6
4#include <SwifTools/Dock/MacOSXDock.h> 7#include <SwifTools/Dock/MacOSXDock.h>
5 8
6#include <AppKit/AppKit.h> 9#include <AppKit/AppKit.h>
7#include <Cocoa/Cocoa.h> 10#include <Cocoa/Cocoa.h>