summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-04-09 13:58:27 +0200
committerCarl Hetherington <cth@carlh.net>2022-04-09 13:58:27 +0200
commitb915348a8288d68e2ff114fb3dd89ad22e699969 (patch)
tree46ce54a62bef93a544ada376d2c42ad4ab50f596 /src/wx
parentc80f7a440de73dead499764b4073d39d54c68b9f (diff)
Add some missing override labels.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/audio_dialog.h2
-rw-r--r--src/wx/barco_alchemy_certificate_panel.h6
-rw-r--r--src/wx/batch_job_view.h6
-rw-r--r--src/wx/check_box.h4
-rw-r--r--src/wx/christie_certificate_panel.h4
-rw-r--r--src/wx/config_dialog.h32
-rw-r--r--src/wx/content_panel.h2
-rw-r--r--src/wx/content_view.h2
-rw-r--r--src/wx/credentials_download_certificate_panel.h2
-rw-r--r--src/wx/dcpomatic_button.h4
-rw-r--r--src/wx/full_config_dialog.cc78
-rw-r--r--src/wx/full_language_tag_dialog.cc2
-rw-r--r--src/wx/gdc_certificate_panel.h4
-rw-r--r--src/wx/normal_job_view.h6
-rw-r--r--src/wx/player_config_dialog.cc22
-rw-r--r--src/wx/playlist_controls.h14
-rw-r--r--src/wx/standard_controls.h10
-rw-r--r--src/wx/static_text.h4
-rw-r--r--src/wx/time_picker.h8
-rw-r--r--src/wx/timeline_text_content_view.h6
-rw-r--r--src/wx/timeline_time_axis_view.h4
-rw-r--r--src/wx/wx_signal_manager.h2
22 files changed, 112 insertions, 112 deletions
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 12dd0cadf..8ba69ec79 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -36,7 +36,7 @@ class AudioDialog : public wxDialog
public:
AudioDialog (wxWindow* parent, std::shared_ptr<Film> film, std::weak_ptr<FilmViewer> viewer, std::shared_ptr<Content> content = std::shared_ptr<Content>());
- bool Show (bool show = true);
+ bool Show (bool show = true) override;
void set_cursor (boost::optional<dcpomatic::DCPTime> time, boost::optional<float> db);
diff --git a/src/wx/barco_alchemy_certificate_panel.h b/src/wx/barco_alchemy_certificate_panel.h
index fce7d3f5d..addae0421 100644
--- a/src/wx/barco_alchemy_certificate_panel.h
+++ b/src/wx/barco_alchemy_certificate_panel.h
@@ -25,7 +25,7 @@ class BarcoAlchemyCertificatePanel : public CredentialsDownloadCertificatePanel
public:
BarcoAlchemyCertificatePanel (DownloadCertificateDialog* dialog);
- bool ready_to_download () const;
- void do_download ();
- wxString name () const;
+ bool ready_to_download () const override;
+ void do_download () override;
+ wxString name () const override;
};
diff --git a/src/wx/batch_job_view.h b/src/wx/batch_job_view.h
index 6d9ccba31..91dca82e9 100644
--- a/src/wx/batch_job_view.h
+++ b/src/wx/batch_job_view.h
@@ -28,10 +28,10 @@ public:
BatchJobView (std::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table);
private:
- int insert_position () const;
- void job_list_changed ();
+ int insert_position () const override;
+ void job_list_changed () override;
- void finish_setup (wxWindow* parent, wxSizer* sizer);
+ void finish_setup (wxWindow* parent, wxSizer* sizer) override;
void higher_priority_clicked ();
void lower_priority_clicked ();
diff --git a/src/wx/check_box.h b/src/wx/check_box.h
index 8e6789e44..5176cd2e8 100644
--- a/src/wx/check_box.h
+++ b/src/wx/check_box.h
@@ -32,8 +32,8 @@ class CheckBox : public wxCheckBox, public I18NHook
public:
CheckBox (wxWindow* parent, wxString label);
- void set_text (wxString text);
- wxString get_text () const;
+ void set_text (wxString text) override;
+ wxString get_text () const override;
};
diff --git a/src/wx/christie_certificate_panel.h b/src/wx/christie_certificate_panel.h
index 41278cb7c..54536a81c 100644
--- a/src/wx/christie_certificate_panel.h
+++ b/src/wx/christie_certificate_panel.h
@@ -25,6 +25,6 @@ class ChristieCertificatePanel : public CredentialsDownloadCertificatePanel
public:
ChristieCertificatePanel (DownloadCertificateDialog* dialog);
- void do_download ();
- wxString name () const;
+ void do_download () override;
+ wxString name () const override;
};
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index b7f3a269f..ce5df2c5b 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -54,7 +54,7 @@ public:
Page (wxSize panel_size, int border);
virtual ~Page () {}
- wxWindow* CreateWindow (wxWindow* parent);
+ wxWindow* CreateWindow (wxWindow* parent) override;
protected:
wxWindow* create_window (wxWindow* parent);
@@ -79,10 +79,10 @@ class GeneralPage : public Page
public:
GeneralPage (wxSize panel_size, int border);
- wxString GetName () const;
+ wxString GetName () const override;
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("general"), wxBITMAP_TYPE_PNG);
}
@@ -91,7 +91,7 @@ public:
protected:
void add_language_controls (wxGridBagSizer* table, int& r);
void add_update_controls (wxGridBagSizer* table, int& r);
- virtual void config_changed ();
+ void config_changed () override;
private:
void setup_sensitivity ();
@@ -156,10 +156,10 @@ public:
: Page (panel_size, border)
{}
- wxString GetName () const;
+ wxString GetName () const override;
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("keys"), wxBITMAP_TYPE_PNG);
}
@@ -167,10 +167,10 @@ public:
private:
- void setup ();
+ void setup () override;
void export_decryption_certificate ();
- void config_changed () {}
+ void config_changed () override {}
bool nag_alter_decryption_chain ();
void decryption_advanced ();
void signing_advanced ();
@@ -187,10 +187,10 @@ public:
: Page (panel_size, border)
{}
- wxString GetName() const;
+ wxString GetName() const override;
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("sound"), wxBITMAP_TYPE_PNG);
}
@@ -198,8 +198,8 @@ public:
private:
- void setup ();
- void config_changed ();
+ void setup () override;
+ void config_changed () override;
boost::optional<std::string> get_sound_output ();
void sound_changed ();
void sound_output_changed ();
@@ -219,15 +219,15 @@ class LocationsPage : public Page
public:
LocationsPage (wxSize panel_size, int border);
- wxString GetName () const;
+ wxString GetName () const override;
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const;
+ wxBitmap GetLargeIcon () const override;
#endif
private:
- void setup ();
- void config_changed ();
+ void setup () override;
+ void config_changed () override;
void content_directory_changed ();
void playlist_directory_changed ();
void kdm_directory_changed ();
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index e25dedcea..650b79668 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -48,7 +48,7 @@ class LimitedSplitter : public wxSplitterWindow
public:
LimitedSplitter (wxWindow* parent);
- bool OnSashPositionChange (int new_position)
+ bool OnSashPositionChange (int new_position) override
{
/* Try to stop the top bit of the splitter getting so small that buttons disappear */
return new_position > 220;
diff --git a/src/wx/content_view.h b/src/wx/content_view.h
index 1ad7c541a..d7c1a43ed 100644
--- a/src/wx/content_view.h
+++ b/src/wx/content_view.h
@@ -39,7 +39,7 @@ public:
std::shared_ptr<Content> selected () const;
void update ();
- std::shared_ptr<Content> get (std::string digest) const;
+ std::shared_ptr<Content> get (std::string digest) const override;
private:
void add (std::shared_ptr<Content> content);
diff --git a/src/wx/credentials_download_certificate_panel.h b/src/wx/credentials_download_certificate_panel.h
index b802768e9..b9af14f5b 100644
--- a/src/wx/credentials_download_certificate_panel.h
+++ b/src/wx/credentials_download_certificate_panel.h
@@ -38,7 +38,7 @@ public:
std::function<void ()> unset_password
);
- virtual bool ready_to_download () const;
+ bool ready_to_download () const override;
private:
void username_changed ();
diff --git a/src/wx/dcpomatic_button.h b/src/wx/dcpomatic_button.h
index 682fa5fe6..aba41b125 100644
--- a/src/wx/dcpomatic_button.h
+++ b/src/wx/dcpomatic_button.h
@@ -29,8 +29,8 @@ class Button : public wxButton, public I18NHook
public:
Button (wxWindow* parent, wxString label, wxPoint pos = wxDefaultPosition, wxSize = wxDefaultSize, long style = 0);
- void set_text (wxString text);
- wxString get_text () const;
+ void set_text (wxString text) override;
+ wxString get_text () const override;
};
#endif
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 1c14ad35c..0699bff22 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -89,7 +89,7 @@ public:
{}
private:
- void setup ()
+ void setup () override
{
auto table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
@@ -146,7 +146,7 @@ private:
_automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this));
}
- void config_changed ()
+ void config_changed () override
{
auto config = Config::instance ();
@@ -246,20 +246,20 @@ public:
: Page (panel_size, border)
{}
- wxString GetName () const
+ wxString GetName () const override
{
return _("Defaults");
}
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("defaults"), wxBITMAP_TYPE_PNG);
}
#endif
private:
- void setup ()
+ void setup () override
{
auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
@@ -385,7 +385,7 @@ private:
}
}
- void config_changed ()
+ void config_changed () override
{
auto config = Config::instance ();
@@ -545,20 +545,20 @@ public:
: Page (panel_size, border)
{}
- wxString GetName () const
+ wxString GetName () const override
{
return _("Servers");
}
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("servers"), wxBITMAP_TYPE_PNG);
}
#endif
private:
- void setup ()
+ void setup () override
{
_use_any_servers = new CheckBox (_panel, _("Search network for servers"));
_panel->GetSizer()->Add (_use_any_servers, 0, wxALL, _border);
@@ -578,7 +578,7 @@ private:
_use_any_servers->Bind (wxEVT_CHECKBOX, boost::bind(&EncodingServersPage::use_any_servers_changed, this));
}
- void config_changed ()
+ void config_changed () override
{
checked_set (_use_any_servers, Config::instance()->use_any_servers ());
_servers_list->refresh ();
@@ -606,20 +606,20 @@ public:
: Page (panel_size, border)
{}
- wxString GetName () const
+ wxString GetName () const override
{
return _("TMS");
}
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("tms"), wxBITMAP_TYPE_PNG);
}
#endif
private:
- void setup ()
+ void setup () override
{
_upload = new CheckBox (_panel, _("Upload DCP to TMS after creation"));
_panel->GetSizer()->Add (_upload, 0, wxALL | wxEXPAND, _border);
@@ -659,7 +659,7 @@ private:
_tms_password->Changed.connect (boost::bind (&TMSPage::tms_password_changed, this));
}
- void config_changed ()
+ void config_changed () override
{
auto config = Config::instance ();
@@ -717,20 +717,20 @@ public:
: Page (panel_size, border)
{}
- wxString GetName () const
+ wxString GetName () const override
{
return _("Email");
}
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("email"), wxBITMAP_TYPE_PNG);
}
#endif
private:
- void setup ()
+ void setup () override
{
auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
@@ -776,7 +776,7 @@ private:
_send_test_email->Bind (wxEVT_BUTTON, boost::bind(&EmailPage::send_test_email_clicked, this));
}
- void config_changed ()
+ void config_changed () override
{
auto config = Config::instance ();
@@ -889,20 +889,20 @@ public:
#endif
{}
- wxString GetName () const
+ wxString GetName () const override
{
return _("KDM Email");
}
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("kdm_email"), wxBITMAP_TYPE_PNG);
}
#endif
private:
- void setup ()
+ void setup () override
{
auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
@@ -948,9 +948,9 @@ private:
_reset_email->Bind (wxEVT_BUTTON, boost::bind (&KDMEmailPage::reset_email, this));
}
- void config_changed ()
+ void config_changed () override
{
- Config* config = Config::instance ();
+ auto config = Config::instance ();
checked_set (_subject, config->kdm_subject ());
checked_set (_from, config->kdm_from ());
@@ -1011,20 +1011,20 @@ public:
#endif
{}
- wxString GetName () const
+ wxString GetName () const override
{
return _("Notifications");
}
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("notifications"), wxBITMAP_TYPE_PNG);
}
#endif
private:
- void setup ()
+ void setup () override
{
auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
@@ -1100,7 +1100,7 @@ private:
_reset_email->Enable(s);
}
- void config_changed ()
+ void config_changed () override
{
auto config = Config::instance ();
@@ -1184,20 +1184,20 @@ public:
#endif
{}
- wxString GetName () const
+ wxString GetName () const override
{
return _("Cover Sheet");
}
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("cover_sheet"), wxBITMAP_TYPE_PNG);
}
#endif
private:
- void setup ()
+ void setup () override
{
_cover_sheet = new wxTextCtrl (_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (-1, 200), wxTE_MULTILINE);
_panel->GetSizer()->Add (_cover_sheet, 0, wxEXPAND | wxALL, _border);
@@ -1209,7 +1209,7 @@ private:
_reset_cover_sheet->Bind (wxEVT_BUTTON, boost::bind (&CoverSheetPage::reset_cover_sheet, this));
}
- void config_changed ()
+ void config_changed () override
{
checked_set (_cover_sheet, Config::instance()->cover_sheet());
}
@@ -1243,20 +1243,20 @@ public:
: Page (panel_size, border)
{}
- wxString GetName () const
+ wxString GetName () const override
{
return _("Identifiers");
}
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("identifiers"), wxBITMAP_TYPE_PNG);
}
#endif
private:
- void setup ()
+ void setup () override
{
auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
@@ -1301,7 +1301,7 @@ private:
_j2k_comment->Bind (wxEVT_TEXT, boost::bind(&IdentifiersPage::j2k_comment_changed, this));
}
- void config_changed ()
+ void config_changed () override
{
auto config = Config::instance ();
checked_set (_issuer, config->dcp_issuer ());
@@ -1361,13 +1361,13 @@ public:
: Page (panel_size, border)
{}
- wxString GetName () const
+ wxString GetName () const override
{
return _("Advanced");
}
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap(bitmap_path("advanced"), wxBITMAP_TYPE_PNG);
}
@@ -1385,7 +1385,7 @@ private:
table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
}
- void setup ()
+ void setup () override
{
auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
@@ -1545,7 +1545,7 @@ private:
#endif
}
- void config_changed ()
+ void config_changed () override
{
auto config = Config::instance ();
diff --git a/src/wx/full_language_tag_dialog.cc b/src/wx/full_language_tag_dialog.cc
index a26dcc0bb..a6d5e49a6 100644
--- a/src/wx/full_language_tag_dialog.cc
+++ b/src/wx/full_language_tag_dialog.cc
@@ -111,7 +111,7 @@ public:
}
private:
- wxString OnGetItemText (long item, long column) const
+ wxString OnGetItemText (long item, long column) const override
{
if (column == 0) {
return _matching_subtags[item].subtag;
diff --git a/src/wx/gdc_certificate_panel.h b/src/wx/gdc_certificate_panel.h
index b69c7a51f..e41254e45 100644
--- a/src/wx/gdc_certificate_panel.h
+++ b/src/wx/gdc_certificate_panel.h
@@ -25,6 +25,6 @@ class GDCCertificatePanel : public CredentialsDownloadCertificatePanel
public:
GDCCertificatePanel (DownloadCertificateDialog* dialog);
- void do_download ();
- wxString name () const;
+ void do_download () override;
+ wxString name () const override;
};
diff --git a/src/wx/normal_job_view.h b/src/wx/normal_job_view.h
index acd8111b6..7d4f72ad5 100644
--- a/src/wx/normal_job_view.h
+++ b/src/wx/normal_job_view.h
@@ -33,10 +33,10 @@ public:
void setup ();
private:
- int insert_position () const;
- void finish_setup (wxWindow* parent, wxSizer* sizer);
+ int insert_position () const override;
+ void finish_setup (wxWindow* parent, wxSizer* sizer) override;
void pause_clicked ();
- void finished ();
+ void finished () override;
wxButton* _pause = nullptr;
};
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 91434beae..af0f8641e 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -78,7 +78,7 @@ public:
{}
private:
- void setup ()
+ void setup () override
{
wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
@@ -132,7 +132,7 @@ private:
_debug_log_file->Bind (wxEVT_FILEPICKER_CHANGED, bind(&PlayerGeneralPage::debug_log_file_changed, this));
}
- void config_changed ()
+ void config_changed () override
{
GeneralPage::config_changed ();
@@ -228,13 +228,13 @@ public:
, _log_timing (0)
{}
- wxString GetName () const
+ wxString GetName () const override
{
return _("Advanced");
}
#ifdef DCPOMATIC_OSX
- wxBitmap GetLargeIcon () const
+ wxBitmap GetLargeIcon () const override
{
return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE);
}
@@ -252,9 +252,9 @@ private:
table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP);
}
- void setup ()
+ void setup () override
{
- wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
table->AddGrowableCol (1, 1);
_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
@@ -288,9 +288,9 @@ private:
#endif
}
- void config_changed ()
+ void config_changed () override
{
- Config* config = Config::instance ();
+ auto config = Config::instance ();
checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL);
checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
@@ -339,17 +339,17 @@ private:
wxPreferencesEditor*
create_player_config_dialog ()
{
- wxPreferencesEditor* e = new wxPreferencesEditor (_("DCP-o-matic Player Preferences"));
+ auto e = new wxPreferencesEditor (_("DCP-o-matic Player Preferences"));
#ifdef DCPOMATIC_OSX
/* Width that we force some of the config panels to be on OSX so that
the containing window doesn't shrink too much when we select those panels.
This is obviously an unpleasant hack.
*/
- wxSize ps = wxSize (520, -1);
+ auto ps = wxSize (520, -1);
int const border = 16;
#else
- wxSize ps = wxSize (-1, -1);
+ auto ps = wxSize (-1, -1);
int const border = 8;
#endif
diff --git a/src/wx/playlist_controls.h b/src/wx/playlist_controls.h
index 8375f952e..57a84c128 100644
--- a/src/wx/playlist_controls.h
+++ b/src/wx/playlist_controls.h
@@ -28,7 +28,7 @@ class PlaylistControls : public Controls
public:
PlaylistControls (wxWindow* parent, std::shared_ptr<FilmViewer> viewer);
- void set_film (std::shared_ptr<Film> film);
+ void set_film (std::shared_ptr<Film> film) override;
/** This is so that we can tell our parent player to reset the film
when we have created one from a SPL. We could call a method
@@ -36,8 +36,8 @@ public:
*/
boost::signals2::signal<void (std::weak_ptr<Film>)> ResetFilm;
- void play ();
- void stop ();
+ void play () override;
+ void stop () override;
private:
void play_clicked ();
@@ -50,10 +50,10 @@ private:
void update_playlist_directory ();
void spl_selection_changed ();
void select_playlist (int selected, int position);
- void started ();
- void stopped ();
- void setup_sensitivity ();
- void config_changed (int);
+ void started () override;
+ void stopped () override;
+ void setup_sensitivity () override;
+ void config_changed (int) override;
void viewer_finished ();
void reset_film ();
void update_current_content ();
diff --git a/src/wx/standard_controls.h b/src/wx/standard_controls.h
index 191924509..4e0e836e8 100644
--- a/src/wx/standard_controls.h
+++ b/src/wx/standard_controls.h
@@ -27,15 +27,15 @@ class StandardControls : public Controls
public:
StandardControls (wxWindow* parent, std::shared_ptr<FilmViewer> viewer, bool editor_controls);
- void play ();
- void stop ();
+ void play () override;
+ void stop () override;
private:
void check_play_state ();
void play_clicked ();
- void started ();
- void stopped ();
- void setup_sensitivity ();
+ void started () override;
+ void stopped () override;
+ void setup_sensitivity () override;
wxToggleButton* _play_button;
};
diff --git a/src/wx/static_text.h b/src/wx/static_text.h
index 0e49379a9..325e1f6d8 100644
--- a/src/wx/static_text.h
+++ b/src/wx/static_text.h
@@ -26,6 +26,6 @@ class StaticText : public wxStaticText, public I18NHook
public:
StaticText (wxWindow* parent, wxString label, wxPoint pos = wxDefaultPosition, wxSize = wxDefaultSize, long style = 0);
- void set_text (wxString text);
- wxString get_text () const;
+ void set_text (wxString text) override;
+ wxString get_text () const override;
};
diff --git a/src/wx/time_picker.h b/src/wx/time_picker.h
index 53b0ce2b8..2d056a22c 100644
--- a/src/wx/time_picker.h
+++ b/src/wx/time_picker.h
@@ -44,8 +44,8 @@ class TimePickerSpin : public TimePicker
public:
TimePickerSpin (wxWindow* parent, wxDateTime time);
- int hours () const;
- int minutes () const;
+ int hours () const override;
+ int minutes () const override;
private:
void changed ();
@@ -60,8 +60,8 @@ class TimePickerText : public TimePicker
public:
TimePickerText (wxWindow* parent, wxDateTime time);
- int hours () const;
- int minutes () const;
+ int hours () const override;
+ int minutes () const override;
private:
void changed ();
diff --git a/src/wx/timeline_text_content_view.h b/src/wx/timeline_text_content_view.h
index 98aea6316..046f5b3e6 100644
--- a/src/wx/timeline_text_content_view.h
+++ b/src/wx/timeline_text_content_view.h
@@ -32,9 +32,9 @@ public:
TimelineTextContentView (Timeline& tl, std::shared_ptr<Content>, std::shared_ptr<TextContent>);
private:
- bool active () const;
- wxColour background_colour () const;
- wxColour foreground_colour () const;
+ bool active () const override;
+ wxColour background_colour () const override;
+ wxColour foreground_colour () const override;
std::shared_ptr<TextContent> _caption;
};
diff --git a/src/wx/timeline_time_axis_view.h b/src/wx/timeline_time_axis_view.h
index 100228ae8..4c8e090fe 100644
--- a/src/wx/timeline_time_axis_view.h
+++ b/src/wx/timeline_time_axis_view.h
@@ -25,11 +25,11 @@ class TimelineTimeAxisView : public TimelineView
public:
TimelineTimeAxisView (Timeline& tl, int y);
- dcpomatic::Rect<int> bbox () const;
+ dcpomatic::Rect<int> bbox () const override;
void set_y (int y);
private:
- void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps);
+ void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps) override;
int _y; ///< y position in tracks (not pixels)
};
diff --git a/src/wx/wx_signal_manager.h b/src/wx/wx_signal_manager.h
index 2e6ddc300..7269acebf 100644
--- a/src/wx/wx_signal_manager.h
+++ b/src/wx/wx_signal_manager.h
@@ -30,7 +30,7 @@ class wxSignalManager : public SignalManager
{
public:
explicit wxSignalManager (wxEvtHandler *);
- void wake_ui ();
+ void wake_ui () override;
private:
wxEvtHandler* _handler;