Skip to content

Commit

Permalink
Fix MS VC++ (2008/2010) compiler error, as discussed in fltk.general in
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Albrecht Schlosser committed Apr 5, 2012
1 parent 8ed93f0 commit abbd983
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion FL/Fl_Window.H
Expand Up @@ -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
Expand Down

0 comments on commit abbd983

Please sign in to comment.