diff options
Diffstat (limited to 'Slimber/Cocoa')
| -rw-r--r-- | Slimber/Cocoa/CocoaAction.h | 26 | ||||
| -rw-r--r-- | Slimber/Cocoa/CocoaAction.mm | 22 | ||||
| -rw-r--r-- | Slimber/Cocoa/CocoaMenulet.h | 2 | ||||
| -rw-r--r-- | Slimber/Cocoa/SConscript | 1 | 
4 files changed, 1 insertions, 50 deletions
diff --git a/Slimber/Cocoa/CocoaAction.h b/Slimber/Cocoa/CocoaAction.h deleted file mode 100644 index a46ef7c..0000000 --- a/Slimber/Cocoa/CocoaAction.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2010 Remko Tronçon - * Licensed under the GNU General Public License v3. - * See Documentation/Licenses/GPLv3.txt for more information. - */ - -#pragma once - -#include <Cocoa/Cocoa.h> -#include <boost/function.hpp> - -@interface CocoaAction : NSObject { -	boost::function<void ()>* function; -} - -/** - * Acquires ownership of 'f'. - */ -- (id) initWithFunction: (boost::function<void()>*) f; - -/** - * Calls the functor passed as a parameter to the contsructor. - */ -- (void) doAction: (id) sender; - -@end diff --git a/Slimber/Cocoa/CocoaAction.mm b/Slimber/Cocoa/CocoaAction.mm deleted file mode 100644 index 15498a1..0000000 --- a/Slimber/Cocoa/CocoaAction.mm +++ /dev/null @@ -1,22 +0,0 @@ -#include "Slimber/Cocoa/CocoaAction.h" - -@implementation CocoaAction - -- (id) initWithFunction: (boost::function<void()>*) f { -    if ([super init]) { -			function = f; -		} -    return self; -} - -- (void) dealloc { -	delete function; -	[super dealloc]; -} - -- (void) doAction: (id) sender { -	(void) sender; -	(*function)(); -} - -@end diff --git a/Slimber/Cocoa/CocoaMenulet.h b/Slimber/Cocoa/CocoaMenulet.h index 7f2758b..5c7c33e 100644 --- a/Slimber/Cocoa/CocoaMenulet.h +++ b/Slimber/Cocoa/CocoaMenulet.h @@ -9,7 +9,7 @@  #include <Cocoa/Cocoa.h>  #include "Slimber/Menulet.h" -#include "Slimber/Cocoa/CocoaAction.h" +#include <SwifTools/Cocoa/CocoaAction.h>  class CocoaMenulet : public Menulet {  	public: diff --git a/Slimber/Cocoa/SConscript b/Slimber/Cocoa/SConscript index e2d8221..d664846 100644 --- a/Slimber/Cocoa/SConscript +++ b/Slimber/Cocoa/SConscript @@ -16,7 +16,6 @@ myenv.Program("Slimber", [  		"main.mm",  		"CocoaController.mm",  		"CocoaMenulet.mm", -		"CocoaAction.mm"  	])  myenv.Nib("MainMenu")  | 
 Swift