From f49b5e1d6d0e59c3027bb5b3cb4c5ef1dc93739b Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Wed, 31 Aug 2011 08:29:02 -0400 Subject: [PATCH] gui: Move stop button It's in the controls.cpp file with the play and pause button code. --- gui/buttons/button.cpp | 10 ---------- gui/buttons/controls.cpp | 13 +++++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gui/buttons/button.cpp b/gui/buttons/button.cpp index 1adf6d42..2ee74584 100644 --- a/gui/buttons/button.cpp +++ b/gui/buttons/button.cpp @@ -19,16 +19,6 @@ GtkWidget *make_button(const gchar *stockid, GtkIconSize size, return button; } -static void on_click_stop(GtkWidget *b, GdkEvent *e, gpointer d) -{ - libsaria_get()->stop(); -} - -GtkWidget *make_stop_button(GtkIconSize size) -{ - return make_button(GTK_STOCK_MEDIA_STOP, size, on_click_stop, true); -} - static void on_click_open_file(GtkWidget *b, GdkEvent *e, gpointer d) { string file = ocarina_choose_file(); diff --git a/gui/buttons/controls.cpp b/gui/buttons/controls.cpp index 9f9d8917..4b3b95cb 100644 --- a/gui/buttons/controls.cpp +++ b/gui/buttons/controls.cpp @@ -64,4 +64,17 @@ GtkWidget *make_pause_button(GtkIconSize size) return b; } +static void on_click_stop(GtkWidget *b, GdkEvent *e, gpointer d) +{ + libsaria_get()->stop(); +} + +GtkWidget *make_stop_button(GtkIconSize size) +{ + return make_button(GTK_STOCK_MEDIA_STOP, + size, + on_click_stop, + true); +} +