Changeset 7b9b700 in git


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.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rd7ee328 r7b9b700  
     1Mon Mar 02 11:45:41 GMT 2015  Olly Betts <olly@survex.com>
     2
     3        * src/gfxcore.cc,src/guicontrol.cc,src/mainfrm.cc: More tweaks to
     4          compile with a unicode build of wx2.8.
     5
    16Mon Mar 02 09:24:59 GMT 2015  Olly Betts <olly@survex.com>
    27
  • src/gfxcore.cc

    rd7ee328 r7b9b700  
    397397                        if (bucket_size) {
    398398                            int y = (GetYSize() + 1) * (HITTEST_SIZE - 1 - j) / HITTEST_SIZE;
    399                             DrawIndicatorText(x, y, wxString::Format("%lu", bucket_size));
     399                            DrawIndicatorText(x, y, wxString::Format(wxT("%lu"), bucket_size));
    400400                        }
    401401                    }
     
    21452145    if (sqrd_measure_threshold == sqrd(MEASURE_THRESHOLD)) {
    21462146        sqrd_measure_threshold = sqrd(5 * MEASURE_THRESHOLD);
    2147         wxMessageBox("Fat finger enabled", "Aven Debug", wxOK | wxICON_INFORMATION);
     2147        wxMessageBox(wxT("Fat finger enabled"), wxT("Aven Debug"), wxOK | wxICON_INFORMATION);
    21482148    } else {
    21492149        sqrd_measure_threshold = sqrd(MEASURE_THRESHOLD);
    2150         wxMessageBox("Fat finger disabled", "Aven Debug", wxOK | wxICON_INFORMATION);
     2150        wxMessageBox(wxT("Fat finger disabled"), wxT("Aven Debug"), wxOK | wxICON_INFORMATION);
    21512151    }
    21522152}
  • src/guicontrol.cc

    rd7ee328 r7b9b700  
    12611261            m_View->ToggleHitTestDebug();
    12621262            break;
    1263         case WXK_F4:
     1263        case WXK_F4: {
     1264            const wxChar * msg;
    12641265#if wxDEBUG_LEVEL
    12651266            if (wxTheAssertHandler)
     
    12671268            else
    12681269                wxSetDefaultAssertHandler();
    1269             wxMessageBox(wxTheAssertHandler ? "Assertions enabled" : "Assertions disabled", "Aven Debug", wxOK | wxICON_INFORMATION);
     1270            if (wxTheAssertHandler)
     1271                msg = wxT("Assertions enabled");
     1272            else
     1273                msg = wxT("Assertions disabled");
    12701274#else
    1271             wxMessageBox("wxWidgets was built without assertions", "Aven Debug", wxOK | wxICON_INFORMATION);
     1275            msg = wxT("wxWidgets was built without assertions");
    12721276#endif
    1273             break;
     1277            wxMessageBox(msg, wxT("Aven Debug"), wxOK | wxICON_INFORMATION);
     1278            break;
     1279        }
    12741280        case WXK_F5:
    12751281            m_View->InvalidateAllLists();
  • 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.