Make refined completion menu compile with TextMate build framework

Author: joachimm

Commands/popup/DocPopup.m renamed to Commands/popup/DocPopup.mm

@@ -12,14 +12,14 @@
 #import <algorithm>
 
 #define TEXT_INDENT 25
-typedef float CGFloat;
+/*typedef float CGFloat;
 CGRect NSRectToCGRect(NSRect nsrect) {
 	return (*(CGRect *)&(nsrect));
 }
 NSRect NSRectFromCGRect(CGRect cgrect) {
 	return (*(NSRect *)&(cgrect));
 }
-
+*/
 int cap (int min, int val, int max)
 {
 	return std::min(max, std::max(val, min));
@@ -221,7 +221,7 @@ - (void)reloadData
 {
 	NSRect frame      = [[self window] frame];
 	frame.size.width  = [self maxItemWidth] + TEXT_INDENT;
-	visibleItemsCount = std::min([[self items] count], (unsigned int)MAX_VISIBLE_ROWS);
+	visibleItemsCount = std::min((unsigned int)[[self items] count], (unsigned int)MAX_VISIBLE_ROWS);
 	// if rect is zero height drawRect->updatePosition isn't called
 	if(visibleItemsCount == 0) {
 		selectedItem = nil;

Commands/popup/Fallback.m renamed to Commands/popup/Fallback.mm

@@ -5,7 +5,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import "CLIProxy.h"
+#import "../../CLIProxy.h"
 #import "DocPopup.h"
 
 #define MAX_ROWS 15