[Gcblue-commits] gcb_wx/include/database tcDatabaseObject.h,1.8,1.9

[Xavi <xr...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/database
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12892

Modified Files:
	tcDatabaseObject.h 
Log Message:
+ newline at the end of file
+ added ifdef where needed
+ removed typedef declaration; instead it uses gctypes.h

Index: tcDatabaseObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/database/tcDatabaseObject.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tcDatabaseObject.h	25 Mar 2004 01:33:38 -0000	1.8
--- tcDatabaseObject.h	28 Mar 2004 19:02:17 -0000	1.9
***************
*** 23,27 ****
--- 23,29 ----
  #define _DATABASEOBJECT_H_
  
+ #if _MSC_VER > 1000
  #pragma once
+ #endif // _MSC_VER > 1000
  
  #include "wx/wx.h" 
***************
*** 33,40 ****
  #include "tcFile.h"
  #include "tcDBString.h"
  
- #ifndef UINT16
- typedef unsigned short UINT16; 
- #endif
  
  class tc3DModel;
--- 35,40 ----
  #include "tcFile.h"
  #include "tcDBString.h"
+ #include "gctypes.h"
  
  
  class tc3DModel;
***************
*** 133,137 ****
          int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion);
          int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization
!         virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization
          static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings
          tcDatabaseObject();
--- 133,137 ----
          int Serialize(tcFile& file, bool mbLoad, UINT32 anVersion);
          int SerializeCSV(CsvTranslator* csv, bool mbLoad); ///< CSV serialization
! 		virtual void SerializeXml(TiXmlElement* node, bool load); ///< XML serialization 
          static int WriteCSVHeader(CsvTranslator* csv); ///< writes column headings
          tcDatabaseObject();
***************
*** 146,148 ****
  }
  
! #endif
\ No newline at end of file
--- 146,148 ----
  }
  
! #endif