# HG changeset patch # User Tomasz Mon # Date 1211094750 -7200 # Node ID 1fe29814b90c00298652ee19bfbd7d13ff0d40c2 # Parent d09dd0960a6a07f9e1c13f5922aa691204a2f567 kill ui_skinned_cursor diff -r d09dd0960a6a -r 1fe29814b90c src/audacious/Makefile --- a/src/audacious/Makefile Sun May 18 08:59:01 2008 +0200 +++ b/src/audacious/Makefile Sun May 18 09:12:30 2008 +0200 @@ -56,7 +56,6 @@ ui_playlist_manager.c \ ui_preferences.c \ ui_skin.c \ - ui_skinned_cursor.c \ ui_skinned_window.c \ ui_skinned_button.c \ ui_skinned_textbox.c \ diff -r d09dd0960a6a -r 1fe29814b90c src/audacious/ui_skin.c --- a/src/audacious/ui_skin.c Sun May 18 08:59:01 2008 +0200 +++ b/src/audacious/ui_skin.c Sun May 18 09:12:30 2008 +0200 @@ -479,7 +479,6 @@ gint i; g_return_if_fail(pix != NULL); - g_return_if_fail(GDK_IS_WINDOW(playlistwin->window)); GdkPixmap *text = gdk_pixmap_new(NULL, gdk_pixbuf_get_width(pix), gdk_pixbuf_get_height(pix), gdk_rgb_get_visual()->depth); gdk_draw_pixbuf(text, NULL, pix, 0, 0, 0, 0, gdk_pixbuf_get_width(pix), gdk_pixbuf_get_height(pix), diff -r d09dd0960a6a -r 1fe29814b90c src/audacious/ui_skinned_cursor.c --- a/src/audacious/ui_skinned_cursor.c Sun May 18 08:59:01 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/* - * Audacious: A cross-platform multimedia player - * Copyright (c) 2007 William Pitcock - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; under version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * The Audacious team does not consider modular code linking to - * Audacious or using our public API to be a derived work. - */ - -#include "platform/smartinclude.h" - -#include -#include -#include -#include -#include - -#include "main.h" -#include "ui_dock.h" -#include "ui_skinned_window.h" -#include "ui_skinned_cursor.h" - -void -ui_skinned_cursor_set(GtkWidget * window) -{ - static GdkCursor *cursor = NULL; - - if (window == NULL) - { - if (cursor != NULL) - { - gdk_cursor_unref(cursor); - cursor = NULL; - } - - return; - } - - if (cursor == NULL) - cursor = gdk_cursor_new(GDK_LEFT_PTR); - - gdk_window_set_cursor(window->window, cursor); -} - diff -r d09dd0960a6a -r 1fe29814b90c src/audacious/ui_skinned_cursor.h --- a/src/audacious/ui_skinned_cursor.h Sun May 18 08:59:01 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* - * Audacious: A cross-platform multimedia player - * Copyright (c) 2007 William Pitcock - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; under version 3 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * The Audacious team does not consider modular code linking to - * Audacious or using our public API to be a derived work. - */ - -#ifndef UI_SKINNED_CURSOR_H -#define UI_SKINNED_CURSOR_H - -void ui_skinned_cursor_set(GtkWidget * window); - -#endif diff -r d09dd0960a6a -r 1fe29814b90c src/audacious/ui_skinned_window.c --- a/src/audacious/ui_skinned_window.c Sun May 18 08:59:01 2008 +0200 +++ b/src/audacious/ui_skinned_window.c Sun May 18 09:12:30 2008 +0200 @@ -31,7 +31,6 @@ #include "main.h" #include "ui_dock.h" #include "ui_skinned_window.h" -#include "ui_skinned_cursor.h" #include "ui_playlist.h" static void ui_skinned_window_class_init(SkinnedWindowClass *klass); @@ -233,8 +232,6 @@ gdk_window_set_back_pixmap(widget->window, NULL, FALSE); gtk_widget_shape_combine_mask(widget, NULL, 0, 0); - ui_skinned_cursor_set(GTK_WIDGET(widget)); - if (!strcmp(wmclass_name, "player")) SKINNED_WINDOW(widget)->type = WINDOW_MAIN; if (!strcmp(wmclass_name, "equalizer"))