ocarina: Removed dead code from window.cpp
Most of this was already commented out, but I also took the time to figure out what header files are no longer needed. Signed-off-by: Bryan Schumaker <bjschuma@gmail.com>
This commit is contained in:
parent
0d5941d72f
commit
694bcb83d7
|
@ -1,15 +1,8 @@
|
|||
// Copyright (c) 2011 Bryan Schumaker
|
||||
|
||||
#include <version.h>
|
||||
#include <ocarina/playlist.h>
|
||||
#include <ocarina/ocarina.h>
|
||||
|
||||
#include <libsaria/audio.h>
|
||||
#include <libsaria/prefs.h>
|
||||
#include <libsaria/deck.h>
|
||||
|
||||
#include <sstream>
|
||||
using namespace std;
|
||||
#include <ocarina/ocarina.h>
|
||||
|
||||
static int old_w, old_h;
|
||||
static bool ignore_configure_event = false;
|
||||
|
@ -103,35 +96,6 @@ static gboolean key_pressed(GtkWidget *widget, GdkEvent *event, gpointer data)
|
|||
return TRUE;
|
||||
}*/
|
||||
|
||||
/*namespace ocarina
|
||||
{
|
||||
|
||||
void window::init()
|
||||
{
|
||||
win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||
|
||||
g_signal_connect(win, "configure-event", G_CALLBACK(configure), NULL);
|
||||
g_signal_connect(win, "window-state-event", G_CALLBACK(window_state), NULL);
|
||||
g_signal_connect(win, "key-press-event", G_CALLBACK(key_pressed), NULL);
|
||||
g_signal_connect_after(win, "key-press-event", G_CALLBACK(key_pressed_after), NULL);
|
||||
|
||||
old_w = libsaria::prefs::init("ocarina.window.w", 800);
|
||||
old_h = libsaria::prefs::init("ocarina.window.h", 600);
|
||||
resize(old_w, old_h);
|
||||
|
||||
if (libsaria::prefs::init("ocarina.window.maximized", false) == true)
|
||||
gtk_window_maximize(GTK_WINDOW(win));
|
||||
|
||||
gtk_widget_show(win);
|
||||
}
|
||||
|
||||
void window::set_content(GtkWidget *content)
|
||||
{
|
||||
gtk_container_add(GTK_CONTAINER(win), content);
|
||||
}
|
||||
|
||||
} *//* Namespace: ocarina */
|
||||
|
||||
void init_window()
|
||||
{
|
||||
GtkWindow *window = GTK_WINDOW(get_widget("MainWindow"));
|
||||
|
|
Loading…
Reference in New Issue