Changeset de0f6e1 in git


Ignore:
Timestamp:
12/06/10 15:27:16 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/survex-1_1, svn/tags/1.1.14, svn/tags/1.1.15, svn/tags/1.1.16, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/tags/v1_1_13, svn/trunk, travis-osx
Children:
833c6bc
Parents:
c0abf5a
Message:

src/gfxcore.cc: Use wxString::FromAscii?() to convert date to
wxString.

git-svn-id: file:///home/survex-svn/survex/branches/survex-1_1@3392 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rc0abf5a rde0f6e1  
     1Sat Jun 12 14:26:32 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * src/gfxcore.cc: Use wxString::FromAscii() to convert date to
     4          wxString.
     5
    16Sun Jun 06 09:36:06 GMT 2010  Olly Betts <olly@survex.com>
    27
  • src/gfxcore.cc

    rc0abf5a rde0f6e1  
    875875                   time_t((double)m_Parent->GetDateExtent() * band / (GetNumDepthBands() - 1));
    876876        size_t res = strftime(buf, sizeof(buf), "%Y-%m-%d", gmtime(&date));
    877         // Insert extra "" to avoid trigraphs issues.
    878         if (res == 0 || res == sizeof(buf)) strcpy(buf, "?""?""?""?-?""?-?""?");
    879         strs[band] = wxString(buf, wxConvUTF8);
     877        if (res == 0 || res == sizeof(buf)) {
     878            // Insert extra "" to avoid trigraphs issues.
     879            strs[band] = wxT("?""?""?""?-?""?-?""?");
     880        } else {
     881            strs[band] = wxString::FromAscii(buf);
     882        }
    880883
    881884        int x;
Note: See TracChangeset for help on using the changeset viewer.