[Adonthell-commits] CVS: adonthell/src/gui base.h, 1.2, 1.3 container.cc, 1.2, 1.3 container.h, 1.2, 1.3 listlayout.cc, 1.1, 1.2

[VENNIN Joel <address@hidden>]

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

Modified Files:
        base.h container.cc container.h listlayout.cc 
Log Message:
Correct bugs in listlayout and container


Index: base.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gui/base.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** base.h      28 Jul 2003 17:05:05 -0000      1.2
--- base.h      28 Jul 2003 18:10:29 -0000      1.3
***************
*** 123,125 ****
--- 123,129 ----
  }
  
+ #ifndef SWIG
+ PYTHON_AS_CALLBACK_ARGUMENT(gui::base)
+ #endif // SWIG
+ 
  #endif

Index: container.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gui/container.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** container.cc        28 Jul 2003 17:05:05 -0000      1.2
--- container.cc        28 Jul 2003 18:10:29 -0000      1.3
***************
*** 1,2 ****
--- 1,3 ----
+ #include <iostream>
  #include "gui/container.h"
  
***************
*** 7,10 ****
--- 8,13 ----
  {
    m_layout = NULL;
+   m_space_child = m_space_border = 5;
+   
  }
  
***************
*** 22,26 ****
  }
  
- 
  void container::removeChild (base * m)
  {
--- 25,28 ----
***************
*** 57,61 ****
  }
  
- 
  bool container::drawContents ()
  {
--- 59,62 ----
***************
*** 72,76 ****
  }
  
- 
  void container::setSpaceChild (s_int16 space)
  {
--- 73,76 ----
***************
*** 94,97 ****
--- 94,98 ----
  void container::setLayout (layout * l)
  {
+   
    if (m_layout) delete m_layout;
    m_layout = l;

Index: container.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gui/container.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** container.h 28 Jul 2003 17:05:05 -0000      1.2
--- container.h 28 Jul 2003 18:10:29 -0000      1.3
***************
*** 56,58 ****
--- 56,62 ----
  }
  
+ #ifndef SWIG
+ PYTHON_AS_CALLBACK_ARGUMENT(gui::container)
+ #endif // SWIG
+ 
  #endif

Index: listlayout.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gui/listlayout.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** listlayout.cc       28 Jul 2003 17:05:05 -0000      1.1
--- listlayout.cc       28 Jul 2003 18:10:29 -0000      1.2
***************
*** 1,2 ****
--- 1,3 ----
+ #include <iostream>
  #include "gui/container.h"
  #include "gui/listlayout.h"