Support buttons.

3 files changed, 15 insertions, 13 deletions

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index ac57baf4b..ca5b4cfe1 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -24,6 +24,7 @@
 #include "wx/job_manager_view.h"
 #include "wx/full_config_dialog.h"
 #include "wx/servers_list_dialog.h"
+#include "wx/dcpomatic_button.h"
 #include "lib/version.h"
 #include "lib/compose.hpp"
 #include "lib/config.h"
@@ -119,13 +120,13 @@ public:
 		_sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
 
 		wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
-		wxButton* add = new wxButton (panel, wxID_ANY, _("Add Film..."));
+		wxButton* add = new Button (panel, _("Add Film..."));
 		add->Bind (wxEVT_BUTTON, boost::bind (&DOMFrame::add_film, this));
 		buttons->Add (add, 1, wxALL, 6);
-		_pause = new wxButton (panel, wxID_ANY, _("Pause"));
+		_pause = new Button (panel, _("Pause"));
 		_pause->Bind (wxEVT_BUTTON, boost::bind(&DOMFrame::pause, this));
 		buttons->Add (_pause, 1, wxALL, 6);
-		_resume = new wxButton (panel, wxID_ANY, _("Resume"));
+		_resume = new Button (panel, _("Resume"));
 		_resume->Bind (wxEVT_BUTTON, boost::bind(&DOMFrame::resume, this));
 		buttons->Add (_resume, 1, wxALL, 6);
 
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 999bba17e..c8ab3cbfb 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -32,6 +32,7 @@
 #include "wx/new_dkdm_folder_dialog.h"
 #include "wx/editable_list.h"
 #include "wx/static_text.h"
+#include "wx/dcpomatic_button.h"
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/screen.h"
@@ -152,11 +153,11 @@ public:
 		);
 		dkdm_sizer->Add (_dkdm, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
 		wxBoxSizer* dkdm_buttons = new wxBoxSizer(wxVERTICAL);
-		_add_dkdm = new wxButton (overall_panel, wxID_ANY, _("Add..."));
+		_add_dkdm = new Button (overall_panel, _("Add..."));
 		dkdm_buttons->Add (_add_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
-		_add_dkdm_folder = new wxButton (overall_panel, wxID_ANY, _("Add folder..."));
+		_add_dkdm_folder = new Button (overall_panel, _("Add folder..."));
 		dkdm_buttons->Add (_add_dkdm_folder, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
-		_remove_dkdm = new wxButton (overall_panel, wxID_ANY, _("Remove"));
+		_remove_dkdm = new Button (overall_panel, _("Remove"));
 		dkdm_buttons->Add (_remove_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
 		dkdm_sizer->Add (dkdm_buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
 		right->Add (dkdm_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
@@ -170,7 +171,7 @@ public:
 		_output = new KDMOutputPanel (overall_panel, false);
 		right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP);
 
-		_create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs"));
+		_create = new Button (overall_panel, _("Create KDMs"));
 		right->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP);
 
 		main_sizer->Add (horizontal, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index c9ceadb26..bee920501 100644
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -125,12 +125,12 @@ public:
 		main_sizer->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP);
 
 		wxBoxSizer* button_sizer = new wxBoxSizer (wxVERTICAL);
-		_up = new wxButton (overall_panel, wxID_ANY, _("Up"));
-		_down = new wxButton (overall_panel, wxID_ANY, _("Down"));
-		_add = new wxButton (overall_panel, wxID_ANY, _("Add"));
-		_remove = new wxButton (overall_panel, wxID_ANY, _("Remove"));
-		_save = new wxButton (overall_panel, wxID_ANY, _("Save playlist"));
-		_load = new wxButton (overall_panel, wxID_ANY, _("Load playlist"));
+		_up = new Button (overall_panel, _("Up"));
+		_down = new Button (overall_panel, _("Down"));
+		_add = new Button (overall_panel, _("Add"));
+		_remove = new Button (overall_panel, _("Remove"));
+		_save = new Button (overall_panel, _("Save playlist"));
+		_load = new Button (overall_panel, _("Load playlist"));
 		button_sizer->Add (_up, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 		button_sizer->Add (_down, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);
 		button_sizer->Add (_add, 0, wxEXPAND | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP);