[Python-ogre-commit] SF.net SVN: python-ogre: [623] trunk/python-ogre

[<and...@us...>]

Revision: 623
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=623&view=rev
Author:   andy_miller
Date:     2008-06-28 01:40:57 -0700 (Sat, 28 Jun 2008)

Log Message:
-----------
Add 'Tree' support to CEGUI
Force bjam location for building boost

Modified Paths:
--------------
    trunk/python-ogre/ChangeLog.txt
    trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
    trunk/python-ogre/environment.py

Modified: trunk/python-ogre/ChangeLog.txt
===================================================================
--- trunk/python-ogre/ChangeLog.txt	2008-06-28 01:46:50 UTC (rev 622)
+++ trunk/python-ogre/ChangeLog.txt	2008-06-28 08:40:57 UTC (rev 623)
@@ -1,3 +1,10 @@
+???? ?? 2008 : SVN Updates..
+============================
+Added CEGUI::Tree to handmadewrapper (Thanks Dermont)
+Change to CEGUI_framework.py to force loading of CEGUIBase lib in the correct mode under Linux - means we don't need to 
+patch the CEGUI source...
+
+
 June 20 2008: Release 1.2 RC2
 ============================='
 OK, so it's been a while -- what can I say, I have to live in the real world as well as the opensource one :)

Modified: trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py
===================================================================
--- trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py	2008-06-28 01:46:50 UTC (rev 622)
+++ trunk/python-ogre/code_generators/cegui/hand_made_wrappers.py	2008-06-28 08:40:57 UTC (rev 623)
@@ -62,6 +62,8 @@
             bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
 EventSet_exposer.def( "subscribeEvent", &EventSet_subscribeEventSet, 
             bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
+EventSet_exposer.def( "subscribeEvent", &EventSet_subscribeTree, 
+            bp::return_value_policy< bp::reference_existing_object, bp::default_call_policies >());
                         
 { //EventConnection
         typedef bp::class_< EventConnection > EventConnection_exposer_t;
@@ -173,7 +175,16 @@
                                         static_cast<const CEGUI::WindowEventArgs&>(args) );
             else
                 boost::python::call<void>(mSubscriber,  
-                                        static_cast<const CEGUI::WindowEventArgs&>(args) );
+                                        static_cast<const CEGUI::WindowEventArgs&>(args) );
+
+         else if (dynamic_cast<CEGUI::TreeEventArgs *>((CEGUI::EventArgs *)&args))
+           if (mMethod.length() > 0 )
+               boost::python::call_method<void>(mSubscriber, mMethod.c_str(),
+                                        static_cast<const CEGUI::TreeEventArgs&>(args) );
+           else
+               boost::python::call<void>(mSubscriber, 
+                                        static_cast<const CEGUI::TreeEventArgs&>(args) );
+
         else 
             boost::python::call_method<void>(mSubscriber, mMethod.c_str(), args );
      return true;
@@ -337,6 +348,13 @@
 {
     EventConnection *connect = new EventConnection(self->subscribeEvent(name, EventCallback(subscriber, method))); 
     return connect; 
+}
+
+EventConnection * EventSet_subscribeTree(CEGUI::Tree *self , CEGUI::String const & name, 
+                                                PyObject* subscriber, CEGUI::String const & method="")
+{
+    EventConnection *connect = new EventConnection(self->subscribeEvent(name, EventCallback(subscriber, method))); 
+    return connect; 
 }
 """
 

Modified: trunk/python-ogre/environment.py
===================================================================
--- trunk/python-ogre/environment.py	2008-06-28 01:46:50 UTC (rev 622)
+++ trunk/python-ogre/environment.py	2008-06-28 08:40:57 UTC (rev 623)
@@ -448,7 +448,7 @@
                 [0, sed_ + " 's/BJAM_CONFIG=\"\"/BJAM_CONFIG=release/' "+base+"/configure", '' ],
                 [0, sed_ + " s/'BOOST_PYTHON_MAX_ARITY 15'/'BOOST_PYTHON_MAX_ARITY 19'/ "+base+"/boost/python/detail/preprocessor.hpp", ''],
                 [0, sed_ + ' s/"# include <boost\/preprocessor\/cat.hpp>"/"\\n#define BOOST_PYTHON_NO_PY_SIGNATURES\\n# include <boost\/preprocessor\/cat.hpp>"/ '+base+'/boost/python/detail/preprocessor.hpp', '' ],
-                [0,"./configure --with-libraries=python --prefix=%s --without-icu"  % PREFIX, os.path.join(os.getcwd(), base )],
+                [0,"./configure --with-libraries=python --prefix=%s --without-icu --with-bjam=../root/usr/bin/bjam"  % PREFIX, os.path.join(os.getcwd(), base )],
                 [0,'make', os.path.join(os.getcwd(), base )],
                 [0,'make install', os.path.join(os.getcwd(), base )],
                 ]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.