[Adonthell-commits] CVS: adonthell/src Makefile.am,1.91,1.92 animation.cc,1.9,1.10 callback.h,1.4,1.5 dialog_screen.cc,1.8,1.9 event.cc,1.12,1.13 image.cc,1.13,1.14 input.cc,1.5,1.6 landmap.cc,1.18,1.19 lex.prefs.cc,1.13,1.14 mapcharacter.cc,1.39,1.40 mapobject.cc,1.5,1.6 mapview.cc,1.14,1.15 prefs.cc,1.21,1.22 prefs.h,1.15,1.16 py_object.cc,1.11,1.12 screen.cc,1.15,1.16 str_hash.h,1.3,1.4 surface.cc,1.11,1.12 text_bubble.cc,1.6,1.7 win_background.cc,1.2,1.3 win_border.cc,1.4,1.5 win_event.cc,1.3,1.4 win_font.h,1.12,1.13 win_scrollbar.cc,1.2,1.3

[Alexandre Courbot <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv4327/src

Modified Files:
        Makefile.am animation.cc callback.h dialog_screen.cc event.cc 
        image.cc input.cc landmap.cc lex.prefs.cc mapcharacter.cc 
        mapobject.cc mapview.cc prefs.cc prefs.h py_object.cc 
        screen.cc str_hash.h surface.cc text_bubble.cc 
        win_background.cc win_border.cc win_event.cc win_font.h 
        win_scrollbar.cc 
Log Message:
Now compiles with gcc 3.1


Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Makefile.am,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** Makefile.am 25 Jun 2002 16:24:15 -0000      1.91
--- Makefile.am 28 Jun 2002 12:15:20 -0000      1.92
***************
*** 46,54 ****
  adonthell_SOURCES = main.cc
  
- 
  # Note: adonthell.py is also built by this target. 
! py_adonthell_wrap.cc : py_adonthell.i *.h
        @if test "${P_SWIG}"; then \
!          ${P_SWIG} -python -shadow ${SDL_CFLAGS} -I./ -I../ -c++ 
-make_default -o $*.cc py_adonthell.i; \
             mv adonthell.py modules/adonthell.py; \
        else \
--- 46,53 ----
  adonthell_SOURCES = main.cc
  
  # Note: adonthell.py is also built by this target. 
! py_adonthell_wrap.cc : py_adonthell.i
        @if test "${P_SWIG}"; then \
!          ${P_SWIG} -python -shadow ${SDL_CFLAGS} -I$(srcdir) -I$(srcdir)/.. 
-c++ -make_default -o $*.cc $(srcdir)/py_adonthell.i; \
             mv adonthell.py modules/adonthell.py; \
        else \

Index: animation.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/animation.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** animation.cc        31 Aug 2001 19:11:16 -0000      1.9
--- animation.cc        28 Jun 2002 12:15:20 -0000      1.10
***************
*** 144,149 ****
  }
   
! void animation::draw (s_int16 x, s_int16 y, const drawing_area * da_opt = 
NULL, 
!                       surface *target = NULL) const
  {
      t_frame[frame[currentframe ()].image_nbr ()]->
--- 144,149 ----
  }
   
! void animation::draw (s_int16 x, s_int16 y, const drawing_area * da_opt, 
!                       surface *target) const
  {
      t_frame[frame[currentframe ()].image_nbr ()]->

Index: callback.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/callback.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** callback.h  29 May 2001 20:59:00 -0000      1.4
--- callback.h  28 Jun 2002 12:15:20 -0000      1.5
***************
*** 154,158 ****
  class FunctionTranslator0wRet:public Functor0wRet<RT>{
  public:
!       FunctionTranslator0wRet(Func f):Functor0wRet<RT>(thunk,0,(PFunc)f,0,0){}
        static RT thunk(const FunctorBase &ftor)
                {
--- 154,158 ----
  class FunctionTranslator0wRet:public Functor0wRet<RT>{
  public:
!       FunctionTranslator0wRet(Func f):Functor0wRet<RT>(thunk,0,(typename 
FunctionTranslator0wRet<RT, Func>::PFunc)f,0,0){}
        static RT thunk(const FunctorBase &ftor)
                {

Index: dialog_screen.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/dialog_screen.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** dialog_screen.cc    27 Apr 2002 22:08:29 -0000      1.8
--- dialog_screen.cc    28 Jun 2002 12:15:20 -0000      1.9
***************
*** 24,29 ****
  
  
! #include <iostream.h>
! #include <string.h>
  #include "gamedata.h"
  #include "input.h"
--- 24,29 ----
  
  
! #include <iostream>
! #include <string>
  #include "gamedata.h"
  #include "input.h"

Index: event.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/event.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** event.cc    2 Nov 2001 13:19:34 -0000       1.12
--- event.cc    28 Jun 2002 12:15:20 -0000      1.13
***************
*** 119,123 ****
  }
  
! void event::set_script (string filename, PyObject * args = NULL)
  {
      if (filename == "") 
--- 119,123 ----
  }
  
! void event::set_script (string filename, PyObject * args)
  {
      if (filename == "") 

Index: image.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/image.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** image.cc    15 Jun 2002 08:37:25 -0000      1.13
--- image.cc    28 Jun 2002 12:15:20 -0000      1.14
***************
*** 287,291 ****
  }
   
! void image::zoom (const surface& src, u_int16 l, u_int16 h, u_int16 x = 0, 
u_int16 y = 0)
  { 
      // Calculate the step per pixel.
--- 287,291 ----
  }
   
! void image::zoom (const surface& src, u_int16 l, u_int16 h, u_int16 x, 
u_int16 y)
  { 
      // Calculate the step per pixel.
***************
*** 321,325 ****
  }
  
! void image::tile (const surface& src, u_int16 l, u_int16 h, u_int16 x = 0, 
u_int16 y = 0)
  {
      u_int16 posx;
--- 321,325 ----
  }
  
! void image::tile (const surface& src, u_int16 l, u_int16 h, u_int16 x, 
u_int16 y)
  {
      u_int16 posx;
***************
*** 333,337 ****
  }
  
! void image::brightness (const surface& src, u_int8 cont, bool proceed_mask = 
false)
  {
      u_int16 i, j;
--- 333,337 ----
  }
  
! void image::brightness (const surface& src, u_int8 cont, bool proceed_mask)
  {
      u_int16 i, j;

Index: input.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/input.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** input.cc    19 Jul 2001 20:20:20 -0000      1.5
--- input.cc    28 Jun 2002 12:15:20 -0000      1.6
***************
*** 83,87 ****
  }
  
! void input::set_key_repeat(int delay=SDL_DEFAULT_REPEAT_DELAY, int 
interval=SDL_DEFAULT_REPEAT_INTERVAL)
  {
    SDL_EnableKeyRepeat(delay, interval);
--- 83,87 ----
  }
  
! void input::set_key_repeat(int delay, int interval)
  {
    SDL_EnableKeyRepeat(delay, interval);

Index: landmap.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/landmap.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** landmap.cc  2 Nov 2001 13:19:34 -0000       1.18
--- landmap.cc  28 Jun 2002 12:15:20 -0000      1.19
***************
*** 371,375 ****
  
  s_int8 landmap::insert_mapobject (mapobject * an, u_int16 pos,
!                                   string srcfile = "")
  {     
      if (pos > nbr_of_mapobjects ())
--- 371,375 ----
  
  s_int8 landmap::insert_mapobject (mapobject * an, u_int16 pos,
!                                   string srcfile)
  {     
      if (pos > nbr_of_mapobjects ())

Index: lex.prefs.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/lex.prefs.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** lex.prefs.cc        26 May 2002 09:27:27 -0000      1.13
--- lex.prefs.cc        28 Jun 2002 12:15:20 -0000      1.14
***************
*** 1366,1370 ****
  #ifndef YY_ALWAYS_INTERACTIVE
  #ifndef YY_NEVER_INTERACTIVE
! #include<unistd.h>
  #endif
  #endif
--- 1366,1370 ----
  #ifndef YY_ALWAYS_INTERACTIVE
  #ifndef YY_NEVER_INTERACTIVE
! extern int isatty YY_PROTO(( int ));
  #endif
  #endif

Index: mapcharacter.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/mapcharacter.cc,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** mapcharacter.cc     28 Apr 2002 14:36:59 -0000      1.39
--- mapcharacter.cc     28 Jun 2002 12:15:20 -0000      1.40
***************
*** 275,279 ****
  
  void mapcharacter::jump_to (u_int16 smap, u_int16 x, u_int16 y,
!                           u_int16 pos = NO_MOVE)
  {
      leave_position (); 
--- 275,279 ----
  
  void mapcharacter::jump_to (u_int16 smap, u_int16 x, u_int16 y,
!                           u_int16 pos)
  {
      leave_position (); 
***************
*** 523,527 ****
  }
  
! bool mapcharacter::set_goal (u_int16 x, u_int16 y, u_int16 dir = NO_MOVE)
  {
      mypath.refmap = mymap ();
--- 523,527 ----
  }
  
! bool mapcharacter::set_goal (u_int16 x, u_int16 y, u_int16 dir)
  {
      mypath.refmap = mymap ();
***************
*** 655,659 ****
  }
  
! void mapcharacter::set_schedule (string file, PyObject * args = NULL)
  {     
      // Clears the schedule
--- 655,659 ----
  }
  
! void mapcharacter::set_schedule (string file, PyObject * args)
  {     
      // Clears the schedule
***************
*** 687,691 ****
  }
  
! void mapcharacter::set_action (string file, PyObject * args = NULL)
  {     
      // Clears the action script
--- 687,691 ----
  }
  
! void mapcharacter::set_action (string file, PyObject * args)
  {     
      // Clears the action script
***************
*** 747,757 ****
  }
  
! void mapcharacter::draw (s_int16 x, s_int16 y, const drawing_area * da_opt = 
NULL, surface * target = NULL) const
  {
      anim[current_move]->draw (x, y, da_opt, target);
  }
  
! void mapcharacter::draw_bubble (s_int16 x, s_int16 y, const drawing_area * 
da_opt = NULL,
!                                 surface * target = NULL) const
  {
      if (saying) 
--- 747,757 ----
  }
  
! void mapcharacter::draw (s_int16 x, s_int16 y, const drawing_area * da_opt, 
surface * target) const
  {
      anim[current_move]->draw (x, y, da_opt, target);
  }
  
! void mapcharacter::draw_bubble (s_int16 x, s_int16 y, const drawing_area * 
da_opt,
!                                 surface * target) const
  {
      if (saying) 

Index: mapobject.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/mapobject.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** mapobject.cc        28 Jul 2001 20:34:49 -0000      1.5
--- mapobject.cc        28 Jun 2002 12:15:20 -0000      1.6
***************
*** 61,65 ****
  }
  
! void mapobject::draw (s_int16 x, s_int16 y, const drawing_area * da_opt = 
NULL, surface * target = NULL) const
  {
      vector <animation *>::iterator i; 
--- 61,65 ----
  }
  
! void mapobject::draw (s_int16 x, s_int16 y, const drawing_area * da_opt, 
surface * target) const
  {
      vector <animation *>::iterator i; 
***************
*** 70,74 ****
  
  void mapobject::draw_from_base (s_int16 x, s_int16 y,
!                                 const drawing_area * da_opt = NULL, surface * 
target = NULL) const
  {
      draw (x - base_x () * MAPSQUARE_SIZE, y - base_y () * MAPSQUARE_SIZE,
--- 70,74 ----
  
  void mapobject::draw_from_base (s_int16 x, s_int16 y,
!                                 const drawing_area * da_opt, surface * 
target) const
  {
      draw (x - base_x () * MAPSQUARE_SIZE, y - base_y () * MAPSQUARE_SIZE,

Index: mapview.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/mapview.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** mapview.cc  25 Apr 2002 15:34:11 -0000      1.14
--- mapview.cc  28 Jun 2002 12:15:20 -0000      1.15
***************
*** 58,62 ****
  }
  
! s_int8 mapview::set_pos (u_int16 sm, u_int16 px, u_int16 py, s_int16 ox = 0, 
s_int16 oy = 0)
  {
      currentsubmap_ = sm;
--- 58,62 ----
  }
  
! s_int8 mapview::set_pos (u_int16 sm, u_int16 px, u_int16 py, s_int16 ox, 
s_int16 oy)
  {
      currentsubmap_ = sm;
***************
*** 88,93 ****
  }
  
! s_int8 mapview::center_on (u_int16 sm, u_int16 px, u_int16 py, s_int16 ox =
!                            0, s_int16 oy = 0)
  {
      s_int32 tpx = px * MAPSQUARE_SIZE + ox - (length () - MAPSQUARE_SIZE >> 
1); 
--- 88,92 ----
  }
  
! s_int8 mapview::center_on (u_int16 sm, u_int16 px, u_int16 py, s_int16 ox, 
s_int16 oy)
  {
      s_int32 tpx = px * MAPSQUARE_SIZE + ox - (length () - MAPSQUARE_SIZE >> 
1); 
***************
*** 229,233 ****
  }
  
! void mapview::set_schedule (string file, PyObject * args = NULL)
  {
      if (file == "") 
--- 228,232 ----
  }
  
! void mapview::set_schedule (string file, PyObject * args)
  {
      if (file == "") 
***************
*** 269,274 ****
  }
  
! void mapview::draw (s_int16 x, s_int16 y, const drawing_area * da_opt = NULL,
!                     surface *target = NULL) const
  {
      static u_int16 i, j;
--- 268,273 ----
  }
  
! void mapview::draw (s_int16 x, s_int16 y, const drawing_area * da_opt,
!                     surface *target) const
  {
      static u_int16 i, j;

Index: prefs.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/prefs.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** prefs.cc    26 May 2002 09:27:27 -0000      1.21
--- prefs.cc    28 Jun 2002 12:15:20 -0000      1.22
***************
*** 28,32 ****
  #include <sys/types.h>
  #include <dirent.h>
- #include <fstream.h>
  #include <unistd.h>
  
--- 28,31 ----

Index: prefs.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/prefs.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** prefs.h     26 May 2002 09:27:27 -0000      1.15
--- prefs.h     28 Jun 2002 12:15:21 -0000      1.16
***************
*** 24,28 ****
  
  #include <string>
! #include <fstream.h>
  #include "types.h"
  
--- 24,28 ----
  
  #include <string>
! #include <fstream>
  #include "types.h"
  

Index: py_object.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/py_object.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** py_object.cc        12 Apr 2002 15:35:40 -0000      1.11
--- py_object.cc        28 Jun 2002 12:15:21 -0000      1.12
***************
*** 49,53 ****
  
  // Pass a (new) Python module to be used
! bool py_object::create_instance (string file, string classname, PyObject * 
args = NULL)
  {
      // Try to import the given script
--- 49,53 ----
  
  // Pass a (new) Python module to be used
! bool py_object::create_instance (string file, string classname, PyObject * 
args)
  {
      // Try to import the given script
***************
*** 60,64 ****
  
  // Reload a python module in case it has changed on disk
! bool py_object::reload_instance (string file, string classname, PyObject * 
args = NULL)
  {
      // Try to import the given script
--- 60,64 ----
  
  // Reload a python module in case it has changed on disk
! bool py_object::reload_instance (string file, string classname, PyObject * 
args)
  {
      // Try to import the given script
***************
*** 95,99 ****
  
  // Execute a method of the script
! PyObject* py_object::call_method_ret (const string & name, PyObject * args = 
NULL)
  {
      PyObject *result = NULL;
--- 95,99 ----
  
  // Execute a method of the script
! PyObject* py_object::call_method_ret (const string & name, PyObject * args)
  {
      PyObject *result = NULL;

Index: screen.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/screen.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** screen.cc   15 Jun 2002 08:37:25 -0000      1.15
--- screen.cc   28 Jun 2002 12:15:21 -0000      1.16
***************
*** 36,40 ****
  bool screen::dblmode;
  
! void screen::set_video_mode (u_int16 nl, u_int16 nh, u_int8 depth = 0, bool 
dbl = false, bool fscreen = false)
  {
      u_int8 bpp;
--- 36,40 ----
  bool screen::dblmode;
  
! void screen::set_video_mode (u_int16 nl, u_int16 nh, u_int8 depth, bool dbl, 
bool fscreen)
  {
      u_int8 bpp;

Index: str_hash.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/str_hash.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** str_hash.h  31 Jan 2002 08:58:29 -0000      1.3
--- str_hash.h  28 Jun 2002 12:15:21 -0000      1.4
***************
*** 31,42 ****
  #include <string>
  
! namespace std 
  {
!       
! template<> struct hash<string> {
!     size_t operator()(const string& s) const {
!       return __stl_hash_string(s.c_str());
! }};
  
- }; // namespace std
  #endif
--- 31,51 ----
  #include <string>
  
! #if __GNUG__ > 2
! namespace __gnu_cxx
! #else
! namespace std
! #endif
  {
!     template<> struct hash<std::string>
!     {
!         size_t operator()(const std::string & __s) const { return 
__stl_hash_string(__s.c_str()); }
!     };
!     
!     
! };
! 
! #if __GNUG__ > 2
! namespace std { using namespace __gnu_cxx; };
! #endif
  
  #endif

Index: surface.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/surface.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** surface.cc  15 Jun 2002 08:37:25 -0000      1.11
--- surface.cc  28 Jun 2002 12:15:21 -0000      1.12
***************
*** 199,204 ****
   
  void surface::draw (s_int16 x, s_int16 y, s_int16 sx, s_int16 sy, u_int16 sl,
!                     u_int16 sh, const drawing_area * da_opt = NULL,
!                     surface * target = NULL) const
  { 
      if (target == NULL) target = &screen::display; 
--- 199,204 ----
   
  void surface::draw (s_int16 x, s_int16 y, s_int16 sx, s_int16 sy, u_int16 sl,
!                     u_int16 sh, const drawing_area * da_opt,
!                     surface * target) const
  { 
      if (target == NULL) target = &screen::display; 
***************
*** 244,248 ****
  
  void surface::fillrect (s_int16 x, s_int16 y, u_int16 l, u_int16 h, u_int32 
col, 
!                         drawing_area * da_opt = NULL)
  {
      if (da_opt) 
--- 244,248 ----
  
  void surface::fillrect (s_int16 x, s_int16 y, u_int16 l, u_int16 h, u_int32 
col, 
!                         drawing_area * da_opt)
  {
      if (da_opt) 

Index: text_bubble.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/text_bubble.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** text_bubble.cc      13 Apr 2002 14:51:20 -0000      1.6
--- text_bubble.cc      28 Jun 2002 12:15:21 -0000      1.7
***************
*** 30,34 ****
  
  text_bubble::text_bubble (const string & text, const string & textcolor,
!                           const string & themename, u_int16 len = 110) : 
win_label ()
  {
      remain = 75 + text.length () * 4;
--- 30,34 ----
  
  text_bubble::text_bubble (const string & text, const string & textcolor,
!                           const string & themename, u_int16 len) : win_label 
()
  {
      remain = 75 + text.length () * 4;

Index: win_background.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_background.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** win_background.cc   28 Jul 2001 20:34:49 -0000      1.2
--- win_background.cc   28 Jun 2002 12:15:21 -0000      1.3
***************
*** 172,176 ****
  
  
! void win_background::draw(drawing_area * da = NULL)
  {
    if(!visible_ || !background_draw_ || !wb_) return; 
--- 172,176 ----
  
  
! void win_background::draw(drawing_area * da)
  {
    if(!visible_ || !background_draw_ || !wb_) return; 

Index: win_border.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_border.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** win_border.cc       23 Feb 2002 21:00:39 -0000      1.4
--- win_border.cc       28 Jun 2002 12:15:21 -0000      1.5
***************
*** 44,48 ****
  }
  
! win_border::win_border(char * rep,char * size=WIN_BORDER_NORMAL_SIZE)
  {
    wb_=NULL;
--- 44,48 ----
  }
  
! win_border::win_border(char * rep,char * size)
  {
    wb_=NULL;

Index: win_event.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_event.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** win_event.cc        3 Aug 2001 17:05:37 -0000       1.3
--- win_event.cc        28 Jun 2002 12:15:21 -0000      1.4
***************
*** 18,22 ****
  
  
! void win_event::py_signal_connect (PyObject *pyfunc, int signal, PyObject 
*args = NULL) 
  {
      // create the callback
--- 18,22 ----
  
  
! void win_event::py_signal_connect (PyObject *pyfunc, int signal, PyObject 
*args) 
  {
      // create the callback

Index: win_font.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_font.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** win_font.h  28 Jul 2001 20:34:49 -0000      1.12
--- win_font.h  28 Jun 2002 12:15:21 -0000      1.13
***************
*** 14,18 ****
  #define _WIN_FONT_H_
  
! #include <iostream.h>
  #include <stdlib.h>
  #include <string.h>
--- 14,18 ----
  #define _WIN_FONT_H_
  
! #include <iostream>
  #include <stdlib.h>
  #include <string.h>

Index: win_scrollbar.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/win_scrollbar.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** win_scrollbar.cc    28 Jul 2001 20:34:49 -0000      1.2
--- win_scrollbar.cc    28 Jun 2002 12:15:21 -0000      1.3
***************
*** 318,322 ****
  
  
! void win_scrollbar::draw(drawing_area * da = NULL)
  {
    if(!visible_ || !back_draw_ || !bar_draw_) return; 
--- 318,322 ----
  
  
! void win_scrollbar::draw(drawing_area * da)
  {
    if(!visible_ || !back_draw_ || !bar_draw_) return;