diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-20 16:16:03 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-20 16:16:03 +0000 |
| commit | cfd4beb36642439db23603f9b8099294761e4624 (patch) | |
| tree | 3e79ba3ea6089033a97917d1e977f94da551422d /src/wx/wx_util.cc | |
| parent | 1f8b45c7fd49714628009f5ed2161fbaa2b4d729 (diff) | |
Fix build.
Diffstat (limited to 'src/wx/wx_util.cc')
| -rw-r--r-- | src/wx/wx_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 367d1edbb..a5399e62e 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -123,7 +123,7 @@ int const ThreadedStaticText::_update_event_id = 10000; * @param initial Initial text for the wxStaticText while the computation is being run. * @param fn Function which works out what the wxStaticText content should be and returns it. */ -ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, function<string ()> fn) +ThreadedStaticText::ThreadedStaticText (wxWindow* parent, wxString initial, boost::function<string ()> fn) : wxStaticText (parent, wxID_ANY, initial) { Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ThreadedStaticText::thread_finished, this, _1), _update_event_id); @@ -139,7 +139,7 @@ ThreadedStaticText::~ThreadedStaticText () /** Run our thread and post the result to the GUI thread via AddPendingEvent */ void -ThreadedStaticText::run (function<string ()> fn) +ThreadedStaticText::run (boost::function<string ()> fn) try { wxCommandEvent ev (wxEVT_COMMAND_TEXT_UPDATED, _update_event_id); |