Changeset d7ee328 in git


Ignore:
Timestamp:
02/03/15 09:25:37 (5 years ago)
Author:
Olly Betts <olly@…>
Branches:
line_contents, master, stereo, travis-osx
Children:
7b9b700
Parents:
445dfe4
Message:

src/labelinfo.h: Fix to compile with a unicode build of wxwidgets
2.8.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r445dfe4 rd7ee328  
     1Mon Mar 02 09:24:59 GMT 2015  Olly Betts <olly@survex.com>
     2
     3        * src/labelinfo.h: Fix to compile with a unicode build of wxwidgets
     4          2.8.
     5
    16Mon Mar 02 07:43:47 GMT 2015  Olly Betts <olly@survex.com>
    27
  • src/labelinfo.h

    r445dfe4 rd7ee328  
    2525#define labelinfo_h
    2626
     27#include "aven.h"
    2728#include "message.h"
    2829#include "vector3.h"
     
    7576    }
    7677    const wxString & GetText() const { return text; }
    77     const char * name_or_anon() const {
    78         if (!text.empty()) return text.c_str();
     78    wxString name_or_anon() const {
     79        if (!text.empty()) return text;
    7980        /* TRANSLATORS: Used in place of the station name when talking about an
    8081         * anonymous station. */
    81         return msg(/*anonymous station*/56);
     82        return wmsg(/*anonymous station*/56);
    8283    }
    8384    int get_flags() const { return flags; }
Note: See TracChangeset for help on using the changeset viewer.