commit 2441e8296dd1f16efef18896d21f2da4689fc628
author Pierre Ossman <ossman@cendio.se> Tue Jul 10 11:11:23 2012 +0000
committer Pierre Ossman <ossman@cendio.se> Tue Jul 10 11:11:23 2012 +0000
tree e62a3bf93a9126bce45d2a749337faa37eb21adf
parent 9919701ec3b7e94d80c96af8e7cb74eb6eca32b9

Hide the full screen setting when support isn't present.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4930 3789f03b-4d11-0410-bbf8-ca57d06f2519

vncviewer/OptionsDialog.cxx

diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index 87cc5af..c82079f 100644
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -286,7 +286,9 @@
     desktopHeightInput->value(buf);
   }
   remoteResizeCheckbox->value(remoteResize);
+#ifdef HAVE_FLTK_FULLSCREEN
   fullScreenCheckbox->value(fullScreen);
+#endif // HAVE_FLTK_FULLSCREEN
 
   handleDesktopSize(desktopSizeCheckbox, this);
 
@@ -389,7 +391,9 @@
     desktopSize.setParam("");
   }
   remoteResize.setParam(remoteResizeCheckbox->value());
+#ifdef HAVE_FLTK_FULLSCREEN
   fullScreen.setParam(fullScreenCheckbox->value());
+#endif // HAVE_FLTK_FULLSCREEN
 
   /* Misc. */
   shared.setParam(sharedCheckbox->value());
@@ -748,12 +752,16 @@
                                                       _("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;
 
+#endif // HAVE_FLTK_FULLSCREEN
+
   group->end();
 }
 

vncviewer/parameters.cxx

diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx
index 7df173b..4407bd9 100644
--- a/vncviewer/parameters.cxx
+++ b/vncviewer/parameters.cxx
@@ -64,7 +64,9 @@
                           "JPEG quality level. 0 = Low, 9 = High",
                           8);
 
+#ifdef HAVE_FLTK_FULLSCREEN
 BoolParameter fullScreen("FullScreen", "Full screen mode", false);
+#endif // HAVE_FLTK_FULLSCREEN
 StringParameter desktopSize("DesktopSize",
                             "Reconfigure desktop size on the server on "
                             "connect (if possible)", "");

vncviewer/parameters.h

diff --git a/vncviewer/parameters.h b/vncviewer/parameters.h
index ce122e7..a935ea0 100644
--- a/vncviewer/parameters.h
+++ b/vncviewer/parameters.h
@@ -37,7 +37,9 @@
 extern rfb::BoolParameter noJpeg;
 extern rfb::IntParameter qualityLevel;
 
+#ifdef HAVE_FLTK_FULLSCREEN
 extern rfb::BoolParameter fullScreen;
+#endif // HAVE_FLTK_FULLSCREEN
 extern rfb::StringParameter desktopSize;
 extern rfb::BoolParameter remoteResize;