diff options
| author | Pierre Ossman <ossman@cendio.se> | 2015-03-12 11:15:32 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2015-03-12 11:15:32 +0100 |
| commit | d1cb31f43636e574058f64ac3e5e4cbe20f162b4 (patch) | |
| tree | 1260ce593ca99b9fe22eb51b906f54b2c0f567fe /vncviewer/cocoa.mm | |
| parent | 59b4bc5638ced3cb5f043ccd9ed207fe76148d1a (diff) | |
| parent | 4cf2d3a621ecb9918b57021bc1cee1bd016dc0aa (diff) | |
| download | tigervnc-d1cb31f43636e574058f64ac3e5e4cbe20f162b4.tar.gz tigervnc-d1cb31f43636e574058f64ac3e5e4cbe20f162b4.zip | |
Merge branch 'upreqs' of https://github.com/CendioOssman/tigervnc
Conflicts:
contrib/packages/rpm/el5/SPECS/tigervnc.spec
vncviewer/Viewport.cxx
Diffstat (limited to 'vncviewer/cocoa.mm')
| -rw-r--r-- | vncviewer/cocoa.mm | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vncviewer/cocoa.mm b/vncviewer/cocoa.mm index e51cba9d..3919cb89 100644 --- a/vncviewer/cocoa.mm +++ b/vncviewer/cocoa.mm @@ -60,11 +60,7 @@ int cocoa_capture_display(Fl_Window *win, bool all_displays) if (count != (unsigned)Fl::screen_count()) return 1; -#ifdef HAVE_FLTK_FULLSCREEN_SCREENS index = Fl::screen_num(win->x(), win->y(), win->w(), win->h()); -#else - index = 0; -#endif if (CGDisplayCapture(displays[index]) != kCGErrorSuccess) return 1; @@ -99,11 +95,9 @@ void cocoa_release_display(Fl_Window *win) // FIXME: Store the previous level somewhere so we don't have to hard // code a level here. -#ifdef HAVE_FLTK_FULLSCREEN if (win->fullscreen_active() && win->contains(Fl::focus())) newlevel = NSStatusWindowLevel; else -#endif newlevel = NSNormalWindowLevel; // Only change if different as the level change also moves the window |