From 99a6faa5131f95cedf978484000fcefec3e6dff4 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Tue, 9 Feb 2016 01:48:08 +0000 Subject: Fix valgrind warning (uninitialized variable) in Fl_Window. Regression only with FLTK_ABI_VERSION >= 10303 (since FLTK 1.3.3). Was fixed in FLTK 1.3.4. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11136 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Window.H | 6 ++---- src/Fl_Window.cxx | 6 +++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 49b511a71..1005e9469 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -3,7 +3,7 @@ // // Window header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2012 by Bill Spitzak and others. +// Copyright 1998-2016 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -57,9 +57,7 @@ class Fl_RGB_Image; class FL_EXPORT Fl_Window : public Fl_Group { static char *default_xclass_; - // Note: we must use separate statements for each of the following 8 variables, - // with the static attribute, otherwise MS VC++ 2008/2010 complains :-( - // AlbrechtS 04/2012 + int no_fullscreen_x; int no_fullscreen_y; int no_fullscreen_w; diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx index 78ab56131..b7a16e6b4 100644 --- a/src/Fl_Window.cxx +++ b/src/Fl_Window.cxx @@ -3,7 +3,7 @@ // // Window widget class for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2016 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -57,6 +57,10 @@ void Fl_Window::_Fl_Window() { no_fullscreen_y = 0; no_fullscreen_w = w(); no_fullscreen_h = h(); + fullscreen_screen_top = -1; + fullscreen_screen_bottom = -1; + fullscreen_screen_left = -1; + fullscreen_screen_right = -1; callback((Fl_Callback*)default_callback); } -- cgit v1.2.3