matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fullscreen only blocked on OS X when not using SDL 1.2.15 (untested)

Browse Source
This commit is contained in:
jacob1 2015-10-22 20:14:56 -04:00
parent d0cf82de03
commit 46dc5da455
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/options/OptionsView.cpp
View File

@ -5,6 +5,11 @@
#else #else
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifdef SDL_INC
#include "SDL/SDL.h"
#else
#include "SDL.h"
#endif
#include "OptionsView.h" #include "OptionsView.h"
#include "gui/Style.h" #include "gui/Style.h"
@ -162,7 +167,7 @@ OptionsView::OptionsView():
FullscreenAction(OptionsView * v_){ v = v_; } FullscreenAction(OptionsView * v_){ v = v_; }
virtual void ActionCallback(ui::Checkbox * sender) virtual void ActionCallback(ui::Checkbox * sender)
{ {
#ifdef MACOSX #if defined(MACOSX) && !SDL_VERSION_ATLEAST(1, 2, 15)
ErrorMessage::Blocking("Error", "fullscreen doesn't work on OS X"); ErrorMessage::Blocking("Error", "fullscreen doesn't work on OS X");
#else #else
v->c->SetFullscreen(sender->GetChecked()); v->c->SetFullscreen(sender->GetChecked());