[simspark-cvs] simspark/contrib ChangeLog, 1.1, 1.2 acinclude.m4, 1.2, 1.3

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/contrib
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/contrib

Modified Files:
	ChangeLog acinclude.m4 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/acinclude.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** acinclude.m4	14 Apr 2006 14:59:06 -0000	1.2
--- acinclude.m4	15 Mar 2007 07:26:23 -0000	1.3
***************
*** 108,112 ****
  	AC_SUBST(KEROSIN_CPPFLAGS, [$spark_kerosin_cppflags])
  
! 	AC_DEFINE(HAVE_KEROSIN_H, 1, [Define to 1 if using the kerosin header])
  ]) # SPARK_LIB_KEROSIN
  
--- 108,112 ----
  	AC_SUBST(KEROSIN_CPPFLAGS, [$spark_kerosin_cppflags])
  
! 	AC_DEFINE(HAVE_KEROSIN_KEROSIN_H, 1, [Define to 1 if using the kerosin header])
  ]) # SPARK_LIB_KEROSIN
  

Index: ChangeLog
===================================================================
RCS file: /cvsroot/simspark/simspark/contrib/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ChangeLog	25 Dec 2005 15:06:28 -0000	1.1
--- ChangeLog	15 Mar 2007 07:26:23 -0000	1.2
***************
*** 0 ****
--- 1,22 ----
+ 2007-03-15  Oliver Obst  <fr...@cs...>
+ 2007-03-15 Oliver Obst <fr...@us...>
+ 
+ 	* acinclude.m4: 
+ 	have to define HAVE_KEROSIN_KEROSIN_H instead of HAVE_KEROSIN_H
+ 	* rsgedit/Makefile.am: - added header files
+ 	* rsgedit/mainframe.cpp: replaced cast with wT macro
+ 
+ 2007-02-28 Oliver Obst <fr...@us...>
+ 
+ 	* rsgedit/agentframe.cpp, rsgedit/agentframe.h: 
+ 	- added Output(const char*) method for convenience
+ 	- fixed a couple of implicit conversions that didn't work on Mac OS / wx 2.5.3 
+ 	
+ 	* rsgedit/mainframe.cpp: 
+ 	- fixed a couple of implicit conversions that didn't work on Mac OS / wx 2.5.3 
+ 	- SetSashGravity is supported from wx 2.5.4, so using this function is disabled for
+ 	  earlier versions of wx
+ 
+ 	* rsgedit/sparktree.h: 
+ 	- had to include wx/wx.h for proper compilation on Mac Os / wx 2.5.3
+