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

[David White]

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

Modified files:
        src/widgets    : textbox.hpp 

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

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

Patches:
Index: wesnoth/src/widgets/textbox.hpp
diff -u wesnoth/src/widgets/textbox.hpp:1.37 
wesnoth/src/widgets/textbox.hpp:1.38
--- wesnoth/src/widgets/textbox.hpp:1.37        Sun Feb 20 22:30:29 2005
+++ wesnoth/src/widgets/textbox.hpp     Mon Feb 21 00:23:44 2005
@@ -1,4 +1,4 @@
-/* $Id: textbox.hpp,v 1.37 2005/02/20 22:30:29 gruikya Exp $ */
+/* $Id: textbox.hpp,v 1.38 2005/02/21 00:23:44 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -43,8 +43,11 @@
 
        void set_wrap(bool val);
 
-       void set_location(const SDL_Rect& rect);
-       using scrollarea::set_location;
+       void set_location(const SDL_Rect& rect);
+
+       //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); }
 
 protected:
        virtual void draw_contents();