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/vncviewer.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/vncviewer.cxx')
| -rw-r--r-- | vncviewer/vncviewer.cxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx index 3f51dd3c..5f846796 100644 --- a/vncviewer/vncviewer.cxx +++ b/vncviewer/vncviewer.cxx @@ -165,7 +165,6 @@ static void init_fltk() Fl_Window::default_xclass("vncviewer"); // Set the default icon for all windows. -#ifdef HAVE_FLTK_ICONS #ifdef WIN32 HICON lg, sm; @@ -225,7 +224,6 @@ static void init_fltk() for (int i = 0;i < count;i++) delete icons[i]; #endif -#endif // FLTK_HAVE_ICONS // This makes the "icon" in dialogs rounded, which fits better // with the above schemes. |