anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

gui: Rename wires.cpp 

I think gui.cpp is a better name, since this file controls most of the
random gui components.

Signed-off-by: Anna Schumaker <schumaker.anna@gmail.com>
This commit is contained in:
Anna Schumaker 2014-03-01 17:49:47 -05:00 committed by Anna Schumaker
parent 44d1fcd1ad
commit 2abc498fde
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/wires.cpp → gui/gui.cpp
View File

@ -237,7 +237,7 @@ void connect_button(const std::string &name, void (*func)())
get_widget<Gtk::Button>(name)->signal_clicked().connect(sigc::ptr_fun(func)); get_widget<Gtk::Button>(name)->signal_clicked().connect(sigc::ptr_fun(func));
} }
Gtk::Window *connect_wires() Gtk::Window *setup_gui()
{ {
struct Callbacks *cb = get_callbacks(); struct Callbacks *cb = get_callbacks();

2
gui/main.cpp
View File

@ -26,7 +26,7 @@ const std::string share_file(const std::string &file)
Gtk::Window *ocarina_init(int *argc, char ***argv) Gtk::Window *ocarina_init(int *argc, char ***argv)
{ {
Gtk::Window *window = connect_wires(); Gtk::Window *window = setup_gui();
audio::init(argc, argv); audio::init(argc, argv);
deck::init(); deck::init();
library::init(); library::init();

4
include/ocarina.h
View File

@ -56,10 +56,10 @@ public:
}; };
/* wires.cpp */ /* gui.cpp */
void enable_idle(); void enable_idle();
void connect_button(const std::string &, void (*func)()); void connect_button(const std::string &, void (*func)());
Gtk::Window *connect_wires(); Gtk::Window *setup_gui();
Glib::RefPtr<Gtk::Builder> &get_builder(); Glib::RefPtr<Gtk::Builder> &get_builder();
template <class T> template <class T>