diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-21 01:00:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-21 01:00:36 +0100 |
| commit | ff96cc9c9e33fbe9dea02ea2d397144f9c9ac8c9 (patch) | |
| tree | 30182f6187bb2ac4df9499f9b64e42aa9ae862dc /src/wx/wx_util.h | |
| parent | 1a9453df58177ff006da99e9ef1ed77624aa7d42 (diff) | |
Hand-apply bd7102b476c631b1fa9067f18ce938d86073f6c8; single-file hashes.
Diffstat (limited to 'src/wx/wx_util.h')
| -rw-r--r-- | src/wx/wx_util.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index f0e20be95..eeb3fee43 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -64,31 +64,6 @@ extern std::string wx_to_std (wxString); extern wxString std_to_wx (std::string); extern void dcpomatic_setup_i18n (); extern wxString context_translation (wxString); - -/** @class ThreadedStaticText - * - * @brief A wxStaticText whose content is computed in a separate thread, to avoid holding - * up the GUI while work is done. - */ -class ThreadedStaticText : public wxStaticText -{ -public: - ThreadedStaticText (wxWindow* parent, wxString initial, boost::function<std::string ()> fn); - ~ThreadedStaticText (); - - /** Emitted in the UI thread when the text has been set up */ - boost::signals2::signal<void()> Finished; - -private: - void run (boost::function<std::string ()> fn); - void thread_finished (wxCommandEvent& ev); - - /** Thread to do our work in */ - boost::thread* _thread; - - static const int _update_event_id; -}; - extern std::string string_client_data (wxClientData* o); extern void checked_set (wxFilePickerCtrl* widget, std::string value); |
