#include "wx/setup.h"
-#if USE_TIMEDATE
+#if wxUSE_TIMEDATE
#include "wx/date.h"
+#include <wx/intl.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
#define ABBR_LENGTH 3
-static const char *dayname[] = {"Sunday","Monday","Tuesday","Wednesday",
- "Thursday","Friday","Saturday"} ;
+static const char *dayname[] = {
+ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+};
-static const char *mname[] = {"January","February","March","April","May",
- "June","July","August","September","October","November","December"};
+static const char *mname[] = {
+ "January", "February", "March", "April", "May", "June", "July", "August",
+ "September", "October", "November", "December"
+};
static int GauDays[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
julian = 0;
}
-wxDate::wxDate (const long j) : julian(j)
+wxDate::wxDate (long j) : julian(j)
{
DisplayFormat=wxMDY;
DisplayOptions='\0';
julian_to_mdy ();
}
-wxDate::wxDate (const int m, const int d, const int y) : month(m), day(d), year(y)
+wxDate::wxDate (int m, int d, int y) : month(m), day(d), year(y)
{
DisplayFormat=wxMDY;
DisplayOptions='\0';
char *token = strtok(buf,"/-");
month = atoi(token);
- day = atoi(strtok(NULL,"/-"));
- year = atoi(strtok(NULL," "));
+ day = atoi(strtok((char *) NULL,"/-"));
+ year = atoi(strtok((char *) NULL," "));
}
mdy_to_julian ();
char *token = strtok(buf,"/-");
month = atoi(token);
- day = atoi(strtok(NULL,"/-"));
- year = atoi(strtok(NULL," "));
+ day = atoi(strtok((char *) NULL,"/-"));
+ year = atoi(strtok((char *) NULL," "));
}
mdy_to_julian ();
// Date Arithmetic
//////////////////////////////////////////////////////////////
-wxDate wxDate::operator + (const long i)
+wxDate wxDate::operator + (long i)
{
wxDate dp(julian + i);
return dp;
}
-wxDate wxDate::operator + (const int i)
+wxDate wxDate::operator + (int i)
{
wxDate dp(julian + (long)i);
return dp;
}
-wxDate wxDate::operator - (const long i)
+wxDate wxDate::operator - (long i)
{
wxDate dp(julian - i);
return dp;
}
-wxDate wxDate::operator - (const int i)
+wxDate wxDate::operator - (int i)
{
wxDate dp(julian - (long)i);
return dp;
return ( julian - dt.julian );
}
-wxDate &wxDate::operator += (const long i)
+wxDate &wxDate::operator += (long i)
{
julian += i;
julian_to_mdy();
return *this;
}
-wxDate &wxDate::operator -= (const long i)
+wxDate &wxDate::operator -= (long i)
{
julian -= i;
julian_to_mdy();
// Format routine
////////////////////////////////////////////////////////////////
-wxString wxDate::FormatDate (const int type) const
+wxString wxDate::FormatDate (int type) const
{
int actualType = type;
if (actualType == -1)
{
case wxDAY:
if ( (day_of_week < 1) || (day_of_week > 7) )
- strcpy(buf,"invalid day");
+ strcpy(buf, _("invalid day"));
else
- strncpy( buf, dayname[day_of_week-1],
+ strncpy( buf, _(dayname[day_of_week-1]),
(DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
return wxString(buf);
case wxMONTH:
if ( (month < 1) || (month > 12) )
- strcpy(buf,"invalid month");
+ strcpy(buf, _("invalid month"));
else
- strncpy( buf, mname[month-1],
+ strncpy( buf, _(mname[month-1]),
(DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
return wxString(buf);
if ( (month < 1) || (month > 12) || (day_of_week < 0) ||
(day_of_week > 7) )
{
- strcpy(buf,"invalid date");
+ strcpy(buf, _("invalid date"));
return wxString(buf);
}
- strncpy( buf, dayname[day_of_week-1],
+ strncpy( buf, _(dayname[day_of_week-1]),
(DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
strcat( buf, ", ");
- strncat( buf, mname[month-1],
+ strncat( buf, _(mname[month-1]),
(DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
strcat( buf, " ");
sprintf( buf+strlen(buf), "%d, %d", day, abs(year) );
if (year < 0)
- strcat(buf," B.C.");
+ strcat(buf,_(" B.C."));
return wxString(buf);
case wxEUROPEAN:
if ( (month < 1) || (month > 12) || (day_of_week < 0) ||
(day_of_week > 7) )
{
- strcpy(buf,"invalid date");
+ strcpy(buf, _("invalid date"));
return wxString(buf);
}
sprintf(buf,"%d ", day);
- strncat(buf, mname[month-1],
+ strncat(buf, _(mname[month-1]),
(DisplayOptions & wxDATE_ABBR) ? ABBR_LENGTH : 9);
sprintf( buf+strlen(buf), " %d", abs(year) );
if (year < 0)
- strcat(buf," B.C.");
+ strcat(buf, _(" B.C."));
return wxString(buf);
case wxMDY:
default:
if (day==0 || month==0 || year==0)
- strcpy(buf,"invalid date");
+ strcpy(buf, _("invalid date"));
else
sprintf( buf+strlen(buf), "%1d/%1d/%02d", month, day,
(DisplayOptions & wxNO_CENTURY) && (abs(year) > 1899)
return wxString("");
}
-void wxDate::SetFormat( const int format )
+void wxDate::SetFormat( int format )
{
DisplayFormat = format;
}
-int wxDate::SetOption( const int option, const bool action )
+int wxDate::SetOption( int option, bool action )
{
switch ( option )
{
wxDate& wxDate::Set()
{
-//#ifdef __WINDOWS__
+//#ifdef __WXMSW__
#if 0
struct _dosdate_t sDate;
_dos_getdate(&sDate);
mdy_to_julian();
#else
- time_t now = time(NULL);
+ time_t now = time((time_t *) NULL);
struct tm *localTime = localtime(&now);
month = localTime->tm_mon + 1;
}
// This function is from NIHCL
-wxDate wxDate::Previous(const int dayOfWeek) const
+wxDate wxDate::Previous(int dayOfWeek) const
{
int this_day_Of_Week, desired_day_Of_Week;
long j;