diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-29 13:49:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-29 13:49:54 +0100 |
| commit | 391d85619ac19a2a93696ddc35c222eb9bb5d9d6 (patch) | |
| tree | fd551f1dda4c97076cbc29465e97e3ad3fdef5e1 /src/wx | |
| parent | 41e0dcde8ea8ec93e14778d09db3d9604b8fada7 (diff) | |
| parent | 8b842865451795d5e8f8b39691c210de1ed5dd4f (diff) | |
Merge master.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_panel.h | 3 | ||||
| -rw-r--r-- | src/wx/film_editor.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h index 1f64d51c6..ab198411d 100644 --- a/src/wx/content_panel.h +++ b/src/wx/content_panel.h @@ -63,10 +63,11 @@ public: SubtitleContentList selected_subtitle (); FFmpegContentList selected_ffmpeg (); + void add_file_clicked (); + private: void sequence_video_changed (); void selection_changed (); - void add_file_clicked (); void add_folder_clicked (); void remove_clicked (); void earlier_clicked (); diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h index b311184fa..25749fffa 100644 --- a/src/wx/film_editor.h +++ b/src/wx/film_editor.h @@ -54,7 +54,6 @@ public: return _film; } -private: /* Handle changes to the model */ void film_changed (Film::Property); void film_content_changed (int); |