From 6e56aa2ff054d780dbac906fa961d5c4529d557f Mon Sep 17 00:00:00 2001 From: Cirilo Bernardo Date: Fri, 3 Jan 2014 08:31:50 -0500 Subject: [PATCH] IDF3 wxDateTime patch to fix MinGW builds for missing localtime_r(). --- pcbnew/idf.cpp | 18 ++++++------------ pcbnew/menubar_pcbframe.cpp | 2 +- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/pcbnew/idf.cpp b/pcbnew/idf.cpp index 6bbddfdabc..0e3066ccc8 100644 --- a/pcbnew/idf.cpp +++ b/pcbnew/idf.cpp @@ -492,30 +492,24 @@ bool IDF_BOARD::Setup( wxString aBoardName, return false; } - - time_t date; - time( &date ); - struct tm tdate; - - time( &date ); - localtime_r( &date, &tdate ); + wxDateTime tdate( time( NULL ) ); fprintf( layoutFile, ".HEADER\n" "BOARD_FILE 3.0 \"Created by KiCad %s\"" - " %.4d/%.2d/%.2d.%.2d:%.2d:%.2d 1\n" + " %.4u/%.2u/%.2u.%.2u:%.2u:%.2u 1\n" "\"%s\" %s\n" ".END_HEADER\n\n", TO_UTF8( GetBuildVersion() ), - tdate.tm_year + 1900, tdate.tm_mon + 1, tdate.tm_mday, - tdate.tm_hour, tdate.tm_min, tdate.tm_sec, + tdate.GetYear(), tdate.GetMonth() + 1, tdate.GetDay(), + tdate.GetHour(), tdate.GetMinute(), tdate.GetSecond(), TO_UTF8( brdname.GetFullName() ), useThou ? "THOU" : "MM" ); fprintf( libFile, ".HEADER\n" "BOARD_FILE 3.0 \"Created by KiCad %s\" %.4d/%.2d/%.2d.%.2d:%.2d:%.2d 1\n" ".END_HEADER\n\n", TO_UTF8( GetBuildVersion() ), - tdate.tm_year + 1900, tdate.tm_mon + 1, tdate.tm_mday, - tdate.tm_hour, tdate.tm_min, tdate.tm_sec ); + tdate.GetYear(), tdate.GetMonth() + 1, tdate.GetDay(), + tdate.GetHour(), tdate.GetMinute(), tdate.GetSecond() ); return true; } diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index 386dfe522d..7dacb03986 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -206,7 +206,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() // IDF3 AddMenuItem( submenuexport, ID_GEN_EXPORT_FILE_IDF3, - _( "I&DFv3 Board Shape Export" ), _( "Basci export of board shape only IDFv3 format" ), + _( "I&DFv3 Board Shape Export" ), _( "Basic export of board shape only IDFv3 format" ), KiBitmap( export_xpm ) ); AddMenuItem( filesMenu, submenuexport,