Changeset 7b9b700 in git for src/mainfrm.cc


Ignore:
Timestamp:
02/03/15 11:46:12 (5 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
b3ee5f5
Parents:
d7ee328
Message:

src/gfxcore.cc,src/guicontrol.cc,src/mainfrm.cc: More tweaks to
compile with a unicode build of wx2.8.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/mainfrm.cc

    rd7ee328 r7b9b700  
    14291429    m_DateStamp_numeric = survey->datestamp_numeric;
    14301430    if (survey->cs) {
    1431         m_cs_proj = survey->cs;
     1431        m_cs_proj = wxString(survey->cs, wxConvUTF8);
    14321432    } else {
    14331433        m_cs_proj = wxString();
     
    21312131         * H: 123.45m V: 234.56m
    21322132         * Dist: 456.78m  Brg: 200 */
    2133         from_str.Printf(wmsg(/*From %s*/339), there->name_or_anon());
     2133        from_str.Printf(wmsg(/*From %s*/339), there->name_or_anon().c_str());
    21342134        int brg_unit;
    21352135        if (m_Gfx->GetDegrees()) {
     
    21812181
    21822182        wxString from_str;
    2183         from_str.Printf(wmsg(/*From %s*/339), there->name_or_anon());
     2183        from_str.Printf(wmsg(/*From %s*/339), there->name_or_anon().c_str());
    21842184
    21852185        if (!m_Gfx->GetMetric()) {
     
    22432243
    22442244        wxString from_str;
    2245         from_str.Printf(wmsg(/*From %s*/339), there->name_or_anon());
     2245        from_str.Printf(wmsg(/*From %s*/339), there->name_or_anon().c_str());
    22462246
    22472247        wxString hv_str;
Note: See TracChangeset for help on using the changeset viewer.