X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fwx%2Fscreens_panel.cc;h=7e012b522e3212fd1ccb0198b93e9e1001c743cb;hb=15ee4641d8b89a16b15611443870d0932152066f;hp=908e94f4dab8b0bbb5d2f46796705f0a76d63846;hpb=e340b96b4a33725e70e3703b0c60ba8da95bca3b;p=dcpomatic.git diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc index 908e94f4d..7e012b522 100644 --- a/src/wx/screens_panel.cc +++ b/src/wx/screens_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2016 Carl Hetherington + Copyright (C) 2015-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -18,13 +18,14 @@ */ -#include "lib/config.h" -#include "lib/cinema.h" -#include "lib/screen.h" #include "screens_panel.h" #include "wx_util.h" #include "cinema_dialog.h" #include "screen_dialog.h" +#include "dcpomatic_button.h" +#include "lib/config.h" +#include "lib/cinema.h" +#include "lib/screen.h" #include using std::list; @@ -35,6 +36,7 @@ using std::string; using std::make_pair; using boost::shared_ptr; using boost::optional; +using namespace dcpomatic; ScreensPanel::ScreensPanel (wxWindow* parent) : wxPanel (parent, wxID_ANY) @@ -54,17 +56,17 @@ ScreensPanel::ScreensPanel (wxWindow* parent) wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL); - _add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema...")); + _add_cinema = new Button (this, _("Add Cinema...")); target_buttons->Add (_add_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - _edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema...")); + _edit_cinema = new Button (this, _("Edit Cinema...")); target_buttons->Add (_edit_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - _remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema")); + _remove_cinema = new Button (this, _("Remove Cinema")); target_buttons->Add (_remove_cinema, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - _add_screen = new wxButton (this, wxID_ANY, _("Add Screen...")); + _add_screen = new Button (this, _("Add Screen...")); target_buttons->Add (_add_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - _edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen...")); + _edit_screen = new Button (this, _("Edit Screen...")); target_buttons->Add (_edit_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); - _remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen")); + _remove_screen = new Button (this, _("Remove Screen")); target_buttons->Add (_remove_screen, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); targets->Add (target_buttons, 0, 0);