From abbd9839bf8c2d469a4a97fbbf7c8a63df1594b9 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 5 Apr 2012 15:04:43 +0000 Subject: Fix MS VC++ (2008/2010) compiler error, as discussed in fltk.general in thread "Compilation error on windows VS 2010 (r9300)" of Mar 24, 2012. Only the "static" attribute had to be fixed now, since the enum access problem had been fixed before (r 9325). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9327 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Window.H | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 624e4b733..f164dcbcc 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -49,10 +49,25 @@ class Fl_X; class FL_EXPORT Fl_Window : public Fl_Group { static char *default_xclass_; + // Note: we must use separate statements for each of the following 4 variables, + // with the static attribute, otherwise MS VC++ 2008/2010 complains :-( + // AlbrechtS 04/2012 #if FLTK_ABI_VERSION < 10302 static // when these members are static, ABI compatibility with 1.3.0 is respected #endif - int no_fullscreen_x, no_fullscreen_y, no_fullscreen_w, no_fullscreen_h; + int no_fullscreen_x; +#if FLTK_ABI_VERSION < 10302 + static // when these members are static, ABI compatibility with 1.3.0 is respected +#endif + int no_fullscreen_y; +#if FLTK_ABI_VERSION < 10302 + static // when these members are static, ABI compatibility with 1.3.0 is respected +#endif + int no_fullscreen_w; +#if FLTK_ABI_VERSION < 10302 + static // when these members are static, ABI compatibility with 1.3.0 is respected +#endif + int no_fullscreen_h; friend class Fl_X; Fl_X *i; // points at the system-specific stuff -- cgit v1.2.3