summaryrefslogtreecommitdiff
path: root/platform/osx
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-04-02 20:26:12 +0200
committerRémi Verschelde <remi@verschelde.fr>2016-04-02 20:26:12 +0200
commit0a5472e697dee57956c2583a50bc5cf5faada5d8 (patch)
tree62e9d9616c9529cee5c6c85e18415bc8745966fe /platform/osx
parent48f057ea816f4ae4b917cb110e399fcbfb4234a0 (diff)
Remove trailing spaces
Diffstat (limited to 'platform/osx')
-rw-r--r--platform/osx/detect.py2
-rw-r--r--platform/osx/dir_access_osx.mm10
-rw-r--r--platform/osx/godot_osx.mm20
-rw-r--r--platform/osx/os_osx.mm4
4 files changed, 18 insertions, 18 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index f7cf5111f5..1f176dc22a 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -5,7 +5,7 @@ import sys
def is_active():
return True
-
+
def get_name():
return "OSX"
diff --git a/platform/osx/dir_access_osx.mm b/platform/osx/dir_access_osx.mm
index 29f8fda663..20dc1df8f4 100644
--- a/platform/osx/dir_access_osx.mm
+++ b/platform/osx/dir_access_osx.mm
@@ -47,9 +47,9 @@ DirAccess *DirAccessOSX::create_fs() {
}
bool DirAccessOSX::list_dir_begin() {
-
+
list_dir_end(); //close any previous dir opening!
-
+
// char real_current_dir_name[2048]; //is this enough?!
//getcwd(real_current_dir_name,2048);
@@ -63,7 +63,7 @@ bool DirAccessOSX::list_dir_begin() {
}
bool DirAccessOSX::file_exists(String p_file) {
-
+
GLOBAL_LOCK_FUNCTION
@@ -207,7 +207,7 @@ Error DirAccessOSX::make_dir(String p_dir) {
GLOBAL_LOCK_FUNCTION
p_dir=fix_path(p_dir);
-
+
char real_current_dir_name[2048];
getcwd(real_current_dir_name,2048);
chdir(current_dir.utf8().get_data()); //ascii since this may be unicode or wathever the host os wants
@@ -326,7 +326,7 @@ size_t DirAccessOSX::get_space_left() {
#else
#warning THIS IS BROKEN
return 0;
-#endif
+#endif
};
diff --git a/platform/osx/godot_osx.mm b/platform/osx/godot_osx.mm
index 0c32016216..02a1382b1a 100644
--- a/platform/osx/godot_osx.mm
+++ b/platform/osx/godot_osx.mm
@@ -50,7 +50,7 @@ static NSString *getApplicationName(void)
dict = (const NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle());
if (dict)
appName = [dict objectForKey: @"CFBundleName"];
-
+
if (![appName length])
appName = [[NSProcessInfo processInfo] processName];
@@ -67,10 +67,10 @@ static void setApplicationMenu(void)
NSMenuItem *menuItem;
NSString *title;
NSString *appName;
-
+
appName = getApplicationName();
appleMenu = [[NSMenu alloc] initWithTitle:@""];
-
+
/* Add menu items */
title = [@"About " stringByAppendingString:appName];
[appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
@@ -90,7 +90,7 @@ static void setApplicationMenu(void)
title = [@"Quit " stringByAppendingString:appName];
[appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
-
+
/* Put menu into the menubar */
menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
[menuItem setSubmenu:appleMenu];
@@ -112,17 +112,17 @@ static void setupWindowMenu(void)
NSMenuItem *menuItem;
windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
-
+
/* "Minimize" item */
menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
[windowMenu addItem:menuItem];
[menuItem release];
-
+
/* Put menu into the menubar */
windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
[windowMenuItem setSubmenu:windowMenu];
[[NSApp mainMenu] addItem:windowMenuItem];
-
+
/* Tell the application object that this is now the window menu */
[NSApp setWindowsMenu:windowMenu];
@@ -139,7 +139,7 @@ static void CustomApplicationMain (int argc, char **argv)
/* Ensure the application object is initialised */
[NSApplication sharedApplication];
-
+
/* Set up the menubar */
[NSApp setMainMenu:[[NSMenu alloc] init]];
setApplicationMenu();
@@ -147,10 +147,10 @@ static void CustomApplicationMain (int argc, char **argv)
main = [[main alloc] init];
[NSApp setDelegate:main];
-
+
/* Start the main event loop */
[NSApp run];
-
+
[main release];
[pool release];
}
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 4b339af6d4..6af2f347aa 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -892,7 +892,7 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
NULL, keyboardLayoutChanged,
kTISNotifySelectedKeyboardInputSourceChanged, NULL,
CFNotificationSuspensionBehaviorDeliverImmediately);
-
+
window_delegate = [[GodotWindowDelegate alloc] init];
// Don't use accumulation buffer support; it's not accelerated
@@ -1170,7 +1170,7 @@ void OS_OSX::warp_mouse_pos(const Point2& p_to) {
mouse_y = p_to.y;
}
else{ //set OS position
-
+
/* this code has not been tested, please be a kind soul and fix it if it fails! */
//local point in window coords