Skip to content

Commit

Permalink
fullscreen only blocked on OS X when not using SDL 1.2.15 (untested)
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob1 committed Oct 23, 2015
1 parent d0cf82d commit 46dc5da
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/gui/options/OptionsView.cpp
Expand Up @@ -5,6 +5,11 @@
#else
#include <unistd.h>
#endif
#ifdef SDL_INC
#include "SDL/SDL.h"
#else
#include "SDL.h"
#endif

#include "OptionsView.h"
#include "gui/Style.h"
Expand Down Expand Up @@ -162,7 +167,7 @@ OptionsView::OptionsView():
FullscreenAction(OptionsView * v_){ v = v_; }
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");
#else
v->c->SetFullscreen(sender->GetChecked());
Expand Down

0 comments on commit 46dc5da

Please sign in to comment.