[Igarden-commit] CommonSource/YAAFExtensions RGDateTime.h, 1.8, 1.8.2.1 RGDateTime.cpp, 1.14, 1.14.2.1

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/CommonSource/YAAFExtensions
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13780

Modified Files:
      Tag: Release_branch_v1
	RGDateTime.h RGDateTime.cpp 
Log Message:
Fix time printing

Index: RGDateTime.h
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGDateTime.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** RGDateTime.h	13 Jan 2006 22:50:57 -0000	1.8
--- RGDateTime.h	29 Dec 2006 04:22:23 -0000	1.8.2.1
***************
*** 80,83 ****
--- 80,86 ----
  //									String&		inDateString );
  		RGDateTime				&operator = (const DateTimeRecord &);
+ #if OPT_MACOS
+ 		RGDateTime				&operator = (const LongDateRec &);
+ #endif
  		void					SetValue(LongDateRec &src);
  		void					Now();

Index: RGDateTime.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGDateTime.cpp,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** RGDateTime.cpp	13 Jan 2006 22:50:57 -0000	1.14
--- RGDateTime.cpp	29 Dec 2006 04:22:23 -0000	1.14.2.1
***************
*** 109,112 ****
--- 109,128 ----
  }
  
+ #if OPT_MACOS
+ RGDateTime &RGDateTime::operator = (const LongDateRec &longRec)
+ {
+ 	DateTimeRecord	dtr;
+ 	
+ 	dtr.day = longRec.ld.day;		/* 1-31 */
+ 	dtr.month = longRec.ld.month;		/* 1-12 */
+ 	dtr.year = longRec.ld.year;		/* 1583 + */
+ 	dtr.hour = longRec.ld.hour;		/* 0-23, 0 = midnight */
+ 	dtr.minute = longRec.ld.minute;		/* 0-59 */
+ 	dtr.second = longRec.ld.second;		/* 0-59 */
+ 	*((XGDateTime*)this) = dtr;
+ 	return *this;
+ }
+ #endif
+ 
  void RGDateTime::AdjustYears(SInt32 inDelta)
  {
***************
*** 197,205 ****
  	MyAssert( inDateForm >= shortDate && inDateForm <= abbrevDate );
  	
! 	grg = GetDouble() - 1721424.5;
! 	mac = (grg - (365.0 * 3.0)) - 1;
! 	LongDateTime	longDateTime = (LongDateTime)(mac * 86400.0);	// See XGDateTime
  	Handle			intlHandle( ::GetIntlResource( ( inDateForm == shortDate ) ? 0 : 1 ) );
  	
  	::LongDateString( &longDateTime, inDateForm, pString, intlHandle );
  	::ReleaseResource( intlHandle );
--- 213,232 ----
  	MyAssert( inDateForm >= shortDate && inDateForm <= abbrevDate );
  	
! //	grg = GetDouble() - 1721424.5;
! //	mac = (grg - (365.0 * 3.0)) - 1;
! 	LongDateTime	longDateTime;	//= (LongDateTime)(mac * 86400.0);	// See XGDateTime
  	Handle			intlHandle( ::GetIntlResource( ( inDateForm == shortDate ) ? 0 : 1 ) );
+ 
+ 	LongDateRec	longRec;
  	
+ 	longRec.ld.era = 0;
+ 	longRec.ld.year = year();
+ 	longRec.ld.month = month();
+ 	longRec.ld.day = day();
+ 	longRec.ld.hour = hour();
+ 	longRec.ld.minute = minute();
+ 	longRec.ld.second = second();
+ //	longRec.ld.pm;
+ 	::LongDateToSeconds (&longRec, &longDateTime);
  	::LongDateString( &longDateTime, inDateForm, pString, intlHandle );
  	::ReleaseResource( intlHandle );