[Wesnoth-cvs-commits] wesnoth/src/widgets scrollpane.hpp

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <[EMAIL PROTECTED]> 05/02/21 00:26:37

Modified files:
        src/widgets    : scrollpane.hpp 

Log message:
        fix to compile error on VC++6

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollpane.hpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: wesnoth/src/widgets/scrollpane.hpp
diff -u wesnoth/src/widgets/scrollpane.hpp:1.4 
wesnoth/src/widgets/scrollpane.hpp:1.5
--- wesnoth/src/widgets/scrollpane.hpp:1.4      Sun Feb 20 22:30:29 2005
+++ wesnoth/src/widgets/scrollpane.hpp  Mon Feb 21 00:26:37 2005
@@ -1,4 +1,4 @@
-/* $Id: scrollpane.hpp,v 1.4 2005/02/20 22:30:29 gruikya Exp $ */
+/* $Id: scrollpane.hpp,v 1.5 2005/02/21 00:26:37 Sirp Exp $ */
 /*
    Copyright (C) 2004 by Philippe Plantier <[EMAIL PROTECTED]>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -44,7 +44,10 @@
        scrollpane(display &d);
 
        virtual void set_location(SDL_Rect const &rect);
-       using widget::set_location;
+
+       //VC++ doesn't like a 'using scrollarea::set_location' directive here, 
so we declare
+       //an inline forwarding function instead
+       void set_location(int x, int y) { widget::set_location(x,y); }
 
        virtual void hide(bool value=true);