Changeset 5f97258 in git


Ignore:
Timestamp:
13/06/10 06:42:23 (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:
d3172cc
Parents:
f302cbaa
Message:

src/printwx.cc: Use wxString::FromAscii?() for the units on the scale
bar which we know to be ASCII. No need to use msgPerm() for a
message we assign to a wxString.

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rf302cbaa r5f97258  
     1Sun Jun 13 05:41:30 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * src/printwx.cc: Use wxString::FromAscii() for the units on the scale
     4          bar which we know to be ASCII.  No need to use msgPerm() for a
     5          message we assign to a wxString.
     6
    17Sun Jun 13 04:44:30 GMT 2010  Olly Betts <olly@survex.com>
    28
  • src/printwx.cc

    rf302cbaa r5f97258  
    729729
    730730   /* Add units used - eg. "Scale (10m)" */
    731    buf.Append(wxString::Format(wxT(" (%.0f%s)"), (double)pow(10.0, (double)E), wxString(u_buf, wxConvUTF8).c_str()));
     731   buf.Append(wxString::Format(wxT(" (%.0f%s)"), (double)pow(10.0, (double)E), wxString::FromAscii(u_buf).c_str()));
    732732   SetColour(PR_COLOUR_TEXT);
    733733   MOVEMM(x, y + 4); WriteString(buf);
     
    11631163    for (pfh = fh_list; *pfh; pfh++) (void)fclose(*pfh);
    11641164    Pre();
    1165     m_layout->footer = wxString(msgPerm(/*Survey `%s'   Page %d (of %d)   Processed on %s*/167),wxConvUTF8);
     1165    m_layout->footer = wmsg(/*Survey `%s'   Page %d (of %d)   Processed on %s*/167);
    11661166}
    11671167
Note: See TracChangeset for help on using the changeset viewer.