From dec4552ffe906006c980ffead16b97b8779e93e1 Mon Sep 17 00:00:00 2001
From: historic_bruno <ben@wildfiregames.com>
Date: Sat, 21 Mar 2015 21:01:01 +0000
Subject: [PATCH] Removes special handling of fullscreen toggle on OS X w/ SDL
 1.2, which is no longer used

This was SVN commit r16453.
---
 source/main.cpp         | 7 +------
 source/ps/VideoMode.cpp | 5 +----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/source/main.cpp b/source/main.cpp
index 051e2f9ab4..68d95e163a 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -155,12 +155,7 @@ static InReaction MainInputHandler(const SDL_Event_* ev)
 		}
 		else if (hotkey == "togglefullscreen")
 		{
-#if !OS_MACOSX || SDL_VERSION_ATLEAST(2, 0, 0)
-			// Fullscreen toggling is broken on OS X w/ SDL 1.2, see http://trac.wildfiregames.com/ticket/741
 			g_VideoMode.ToggleFullscreen();
-#else
-			LOGWARNING("Toggling fullscreen and resizing are disabled on OS X due to a known bug. Please use the config file to change display settings.");
-#endif
 			return IN_HANDLED;
 		}
 		else if (hotkey == "profile2.toggle")
diff --git a/source/ps/VideoMode.cpp b/source/ps/VideoMode.cpp
index 6fe73a1ae1..b87a93e037 100644
--- a/source/ps/VideoMode.cpp
+++ b/source/ps/VideoMode.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -159,11 +159,8 @@ bool CVideoMode::SetVideoMode(int w, int h, int bpp, bool fullscreen)
 	Uint32 flags = SDL_OPENGL;
 	if (fullscreen)
 		flags |= SDL_FULLSCREEN;
-#if !OS_MACOSX
-	// TODO: Fix window resizing on OS X, see http://trac.wildfiregames.com/ticket/741
 	else
 		flags |= SDL_RESIZABLE;
-#endif
 
 	SDL_Surface* screen = SDL_SetVideoMode(w, h, bpp, flags);