diff --git a/src/pcedit/pc.main.cpp b/src/pcedit/pc.main.cpp index f61734f9..722ade55 100644 --- a/src/pcedit/pc.main.cpp +++ b/src/pcedit/pc.main.cpp @@ -126,7 +126,7 @@ int main(int argc, char* argv[]) { init_tiling(); init_snd_tool(); -#ifdef SFML_SYSTEM_MAC +#ifdef SFML_SYSTEM_MACOS init_menubar(); // This is called twice because Windows and Mac have different ordering requirements #endif @@ -190,7 +190,7 @@ void adjust_window (sf::RenderWindow& mainPtr, sf::View& mainView) { // Apply view to the main window mainPtr.setView(mainView); -#ifndef SFML_SYSTEM_MAC // This overrides Dock icon on OSX, which isn't what we want at all +#ifndef SFML_SYSTEM_MACOS // This overrides Dock icon on OSX, which isn't what we want at all const ImageRsrc& icon = ResMgr::graphics.get("icon", true); mainPtr.setIcon(icon->getSize().x, icon->getSize().y, icon->copyToImage().getPixelsPtr()); #endif diff --git a/src/scenedit/scen.main.cpp b/src/scenedit/scen.main.cpp index d2a8146e..807e92dd 100644 --- a/src/scenedit/scen.main.cpp +++ b/src/scenedit/scen.main.cpp @@ -180,7 +180,7 @@ void adjust_windows (sf::RenderWindow & mainPtr, sf::View & mainView) { // Apply view to the main window mainPtr.setView(mainView); -#ifndef SFML_SYSTEM_MAC // This overrides Dock icon on OSX, which isn't what we want at all +#ifndef SFML_SYSTEM_MACOS // This overrides Dock icon on OSX, which isn't what we want at all const ImageRsrc& icon = ResMgr::graphics.get("icon", true); mainPtr.setIcon(icon->getSize().x, icon->getSize().y, icon->copyToImage().getPixelsPtr()); #endif @@ -226,7 +226,7 @@ void init_scened(int argc, char* argv[]) { init_shaders(); init_tiling(); init_snd_tool(); -#ifdef SFML_SYSTEM_MAC +#ifdef SFML_SYSTEM_MACOS init_menubar(); // This is called twice because Windows and Mac have different ordering requirements #endif mainPtr.clear(sf::Color::Black); diff --git a/src/tools/winutil.hpp b/src/tools/winutil.hpp index cb56fb5e..34735279 100644 --- a/src/tools/winutil.hpp +++ b/src/tools/winutil.hpp @@ -63,7 +63,7 @@ int getMenubarHeight(); // coordinate space, but on Linux it is. inline int os_specific_y_offset() { return -#if defined(SFML_SYSTEM_WINDOWS) || defined(SFML_SYSTEM_MAC) +#if defined(SFML_SYSTEM_WINDOWS) || defined(SFML_SYSTEM_MACOS) 0; #else getMenubarHeight();