Changeset a5e8ada in git


Ignore:
Timestamp:
04/06/10 13:45:22 (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:
9227253
Parents:
15322f2
Message:

src/mainfrm.cc: Explicitly construct temporary wxString() which
is needed to avoid overload ambiguity under WXMSW.

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r15322f2 ra5e8ada  
     1Fri Jun 04 12:44:39 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * src/mainfrm.cc: Explicitly construct temporary wxString() which
     4          is needed to avoid overload ambiguity under __WXMSW__.
     5
    16Fri Jun 04 12:41:59 GMT 2010  Olly Betts <olly@survex.com>
    27
  • src/mainfrm.cc

    r15322f2 ra5e8ada  
    8080public:
    8181    EditMarkDlg(wxWindow* parent, const PresentationMark & p)
    82         : wxDialog(parent, 500, wxT("Edit Waypoint"))
     82        : wxDialog(parent, 500, wxString(wxT("Edit Waypoint")))
    8383    {
    8484        easting = new wxTextCtrl(this, 601, wxString::Format(wxT("%.3f"), p.GetX()));
Note: See TracChangeset for help on using the changeset viewer.