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/OptionsDialog.cxx | |
| 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/OptionsDialog.cxx')
| -rw-r--r-- | vncviewer/OptionsDialog.cxx | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx index d1495ef2..3c8fcb48 100644 --- a/vncviewer/OptionsDialog.cxx +++ b/vncviewer/OptionsDialog.cxx @@ -290,12 +290,8 @@ void OptionsDialog::loadOptions(void) desktopHeightInput->value(buf); } remoteResizeCheckbox->value(remoteResize); -#ifdef HAVE_FLTK_FULLSCREEN fullScreenCheckbox->value(fullScreen); -#ifdef HAVE_FLTK_FULLSCREEN_SCREENS fullScreenAllMonitorsCheckbox->value(fullScreenAllMonitors); -#endif // HAVE_FLTK_FULLSCREEN_SCREENS -#endif // HAVE_FLTK_FULLSCREEN handleDesktopSize(desktopSizeCheckbox, this); @@ -398,12 +394,8 @@ void OptionsDialog::storeOptions(void) desktopSize.setParam(""); } remoteResize.setParam(remoteResizeCheckbox->value()); -#ifdef HAVE_FLTK_FULLSCREEN fullScreen.setParam(fullScreenCheckbox->value()); -#ifdef HAVE_FLTK_FULLSCREEN_SCREENS fullScreenAllMonitors.setParam(fullScreenAllMonitorsCheckbox->value()); -#endif // HAVE_FLTK_FULLSCREEN_SCREENS -#endif // HAVE_FLTK_FULLSCREEN /* Misc. */ shared.setParam(sharedCheckbox->value()); @@ -758,26 +750,18 @@ void OptionsDialog::createScreenPage(int tx, int ty, int tw, int th) _("Resize remote session to the local window"))); ty += CHECK_HEIGHT + TIGHT_MARGIN; -#ifdef HAVE_FLTK_FULLSCREEN - fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty, CHECK_MIN_WIDTH, CHECK_HEIGHT, _("Full-screen mode"))); ty += CHECK_HEIGHT + TIGHT_MARGIN; -#ifdef HAVE_FLTK_FULLSCREEN_SCREENS - fullScreenAllMonitorsCheckbox = new Fl_Check_Button(LBLRIGHT(tx + INDENT, ty, CHECK_MIN_WIDTH, CHECK_HEIGHT, _("Enable full-screen mode over all monitors"))); ty += CHECK_HEIGHT + TIGHT_MARGIN; -#endif // HAVE_FLTK_FULLSCREEN_SCREENS - -#endif // HAVE_FLTK_FULLSCREEN - group->end(); } |