Mercurial > audlegacy

changeset 3105:1912eba1004b audacious-1.4.0-dr1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaning
author Tomasz Mon <desowin@gmail.com>
date Thu, 19 Jul 2007 16:21:31 +0200
parents 992250ce4cc7
children 53b5106dbe09
files src/audacious/ui_skinned_button.c src/audacious/ui_skinned_button.h src/audacious/ui_skinned_equalizer_graph.c src/audacious/ui_skinned_equalizer_graph.h src/audacious/ui_skinned_equalizer_slider.h src/audacious/ui_skinned_horizontal_slider.c src/audacious/ui_skinned_horizontal_slider.h src/audacious/ui_skinned_menurow.c src/audacious/ui_skinned_menurow.h src/audacious/ui_skinned_monostereo.c src/audacious/ui_skinned_monostereo.h src/audacious/ui_skinned_textbox.c src/audacious/ui_skinned_textbox.h src/audacious/ui_vis.c src/audacious/ui_vis.h
diffstat 15 files changed, 34 insertions(+), 100 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/ui_skinned_button.c	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_button.c	Thu Jul 19 16:21:31 2007 +0200
@@ -20,22 +20,19 @@
 #include "ui_skinned_button.h"
 #include "util.h"
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmarshal.h>
-
-#define UI_SKINNED_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UI_TYPE_SKINNED_BUTTON, UiSkinnedButtonPrivate))
+#define UI_SKINNED_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ui_skinned_button_get_type(), UiSkinnedButtonPrivate))
 typedef struct _UiSkinnedButtonPrivate UiSkinnedButtonPrivate;
 
 static GMutex *mutex = NULL;
 
 enum {
-	PRESSED,
-	RELEASED,
-	CLICKED,
-	RIGHT_CLICKED,
-	DOUBLED,
-	REDRAW,
-	LAST_SIGNAL
+    PRESSED,
+    RELEASED,
+    CLICKED,
+    RIGHT_CLICKED,
+    DOUBLED,
+    REDRAW,
+    LAST_SIGNAL
 };
 
 struct _UiSkinnedButtonPrivate {
--- a/src/audacious/ui_skinned_button.h	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_button.h	Thu Jul 19 16:21:31 2007 +0200
@@ -19,50 +19,40 @@
 #ifndef UISKINNEDBUTTON_H
 #define UISKINNEDBUTTON_H
 
-#include <gdk/gdk.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkenums.h>
-#include "widgets/skin.h"
-
-#define UI_TYPE_SKINNED_BUTTON            (ui_skinned_button_get_type())
-#define UI_SKINNED_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), UI_TYPE_SKINNED_BUTTON, UiSkinnedButton))
-#define UI_SKINNED_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), UI_TYPE_SKINNED_BUTTON, UiSkinnedButtonClass))
-#define UI_SKINNED_IS_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UI_TYPE_SKINNED_BUTTON))
-#define UI_IS_SKINNED_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UI_TYPE_SKINNED_BUTTON))
-#define UI_SKINNED_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), UI_TYPE_SKINNED_BUTTON, GtkFlatButtonClass))
+#define UI_SKINNED_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), ui_skinned_button_get_type(), UiSkinnedButton))
+#define UI_SKINNED_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  ui_skinned_button_get_type(), UiSkinnedButtonClass))
+#define UI_SKINNED_IS_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ui_skinned_button_get_type()))
 
 typedef struct _UiSkinnedButton		UiSkinnedButton;
 typedef struct _UiSkinnedButtonClass	UiSkinnedButtonClass;
 
 enum {
-	TYPE_NOT_SET,
-	TYPE_PUSH,
-	TYPE_TOGGLE,
-	TYPE_SMALL
+    TYPE_NOT_SET,
+    TYPE_PUSH,
+    TYPE_TOGGLE,
+    TYPE_SMALL
 };
 
 struct _UiSkinnedButton {
-	GtkWidget widget;
-
-	GdkWindow *event_window;
+    GtkWidget widget;
 
-	gboolean button_down : 1;
-	gboolean pressed : 1;
-	gboolean hover : 1;
-	gboolean inside : 1;
-	gint type;
-
-	gint x, y;
+    GdkWindow *event_window;
+    gboolean button_down;
+    gboolean pressed;
+    gboolean hover;
+    gboolean inside;
+    gint type;
+    gint x, y;
 };
 
 struct _UiSkinnedButtonClass {
-	GtkWidgetClass          parent_class;
-	void (* pressed)       (UiSkinnedButton *button);
-	void (* released)      (UiSkinnedButton *button);
-	void (* clicked)       (UiSkinnedButton *button);
-	void (* right_clicked) (UiSkinnedButton *button);
-	void (* doubled)       (UiSkinnedButton *button);
-	void (* redraw)        (UiSkinnedButton *button);
+    GtkWidgetClass          parent_class;
+    void (* pressed)       (UiSkinnedButton *button);
+    void (* released)      (UiSkinnedButton *button);
+    void (* clicked)       (UiSkinnedButton *button);
+    void (* right_clicked) (UiSkinnedButton *button);
+    void (* doubled)       (UiSkinnedButton *button);
+    void (* redraw)        (UiSkinnedButton *button);
 };
 
 GType ui_skinned_button_get_type(void) G_GNUC_CONST;
--- a/src/audacious/ui_skinned_equalizer_graph.c	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_equalizer_graph.c	Thu Jul 19 16:21:31 2007 +0200
@@ -26,8 +26,6 @@
 #include "ui_skinned_equalizer_graph.h"
 #include "main.h"
 #include "util.h"
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmarshal.h>
 
 #define UI_TYPE_SKINNED_EQUALIZER_GRAPH           (ui_skinned_equalizer_graph_get_type())
 
--- a/src/audacious/ui_skinned_equalizer_graph.h	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_equalizer_graph.h	Thu Jul 19 16:21:31 2007 +0200
@@ -25,10 +25,6 @@
 #ifndef UISKINNEDEQUALIZERGRAPH_H
 #define UISKINNEDEQUALIZERGRAPH_H
 
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/src/audacious/ui_skinned_equalizer_slider.h	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_equalizer_slider.h	Thu Jul 19 16:21:31 2007 +0200
@@ -25,10 +25,6 @@
 #ifndef UISKINNEDEQUALIZER_SLIDER_H
 #define UISKINNEDEQUALIZER_SLIDER_H
 
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/src/audacious/ui_skinned_horizontal_slider.c	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_horizontal_slider.c	Thu Jul 19 16:21:31 2007 +0200
@@ -26,11 +26,8 @@
 #include "ui_skinned_horizontal_slider.h"
 #include "main.h"
 #include "util.h"
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmarshal.h>
 
-#define UI_TYPE_SKINNED_HORIZONTAL_SLIDER           (ui_skinned_horizontal_slider_get_type())
-#define UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UI_TYPE_SKINNED_HORIZONTAL_SLIDER, UiSkinnedHorizontalSliderPrivate))
+#define UI_SKINNED_HORIZONTAL_SLIDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ui_skinned_horizontal_slider_get_type(), UiSkinnedHorizontalSliderPrivate))
 typedef struct _UiSkinnedHorizontalSliderPrivate UiSkinnedHorizontalSliderPrivate;
 
 enum {
--- a/src/audacious/ui_skinned_horizontal_slider.h	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_horizontal_slider.h	Thu Jul 19 16:21:31 2007 +0200
@@ -25,13 +25,9 @@
 #ifndef UISKINNEDHORIZONTAL_SLIDER_H
 #define UISKINNEDHORIZONTAL_SLIDER_H
 
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
-
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */
+#endif
 
 #define UI_SKINNED_HORIZONTAL_SLIDER(obj)          GTK_CHECK_CAST (obj, ui_skinned_horizontal_slider_get_type (), UiSkinnedHorizontalSlider)
 #define UI_SKINNED_HORIZONTAL_SLIDER_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, ui_skinned_horizontal_slider_get_type (), UiSkinnedHorizontalSliderClass)
--- a/src/audacious/ui_skinned_menurow.c	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_menurow.c	Thu Jul 19 16:21:31 2007 +0200
@@ -26,10 +26,6 @@
 #include "ui_skinned_menurow.h"
 #include "main.h"
 #include "util.h"
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmarshal.h>
-
-#define UI_TYPE_SKINNED_MENUROW           (ui_skinned_menurow_get_type())
 
 enum {
     DOUBLED,
--- a/src/audacious/ui_skinned_menurow.h	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_menurow.h	Thu Jul 19 16:21:31 2007 +0200
@@ -25,10 +25,6 @@
 #ifndef UISKINNEDMENUROW_H
 #define UISKINNEDMENUROW_H
 
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/src/audacious/ui_skinned_monostereo.c	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_monostereo.c	Thu Jul 19 16:21:31 2007 +0200
@@ -26,10 +26,6 @@
 #include "ui_skinned_monostereo.h"
 #include "main.h"
 #include "util.h"
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmarshal.h>
-
-#define UI_TYPE_SKINNED_MONOSTEREO           (ui_skinned_monostereo_get_type())
 
 enum {
     DOUBLED,
--- a/src/audacious/ui_skinned_monostereo.h	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_monostereo.h	Thu Jul 19 16:21:31 2007 +0200
@@ -25,10 +25,6 @@
 #ifndef UISKINNEDMONOSTEREO_H
 #define UISKINNEDMONOSTEREO_H
 
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/src/audacious/ui_skinned_textbox.c	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_textbox.c	Thu Jul 19 16:21:31 2007 +0200
@@ -28,12 +28,8 @@
 #include "util.h"
 #include "strings.h"
 #include <string.h>
-#include <ctype.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmarshal.h>
 
-#define UI_TYPE_SKINNED_TEXTBOX           (ui_skinned_textbox_get_type())
-#define UI_SKINNED_TEXTBOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UI_TYPE_SKINNED_TEXTBOX, UiSkinnedTextboxPrivate))
+#define UI_SKINNED_TEXTBOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ui_skinned_textbox_get_type(), UiSkinnedTextboxPrivate))
 typedef struct _UiSkinnedTextboxPrivate UiSkinnedTextboxPrivate;
 
 static GMutex *mutex = NULL;
--- a/src/audacious/ui_skinned_textbox.h	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_skinned_textbox.h	Thu Jul 19 16:21:31 2007 +0200
@@ -25,13 +25,9 @@
 #ifndef UISKINNEDTEXTBOX_H
 #define UISKINNEDTEXTBOX_H
 
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
-
 #ifdef __cplusplus
 extern "C" {
-#endif /* __cplusplus */
+#endif
 
 #define UI_SKINNED_TEXTBOX(obj)          GTK_CHECK_CAST (obj, ui_skinned_textbox_get_type (), UiSkinnedTextbox)
 #define UI_SKINNED_TEXTBOX_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, ui_skinned_textbox_get_type (), UiSkinnedTextboxClass)
--- a/src/audacious/ui_vis.c	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_vis.c	Thu Jul 19 16:21:31 2007 +0200
@@ -26,15 +26,7 @@
 #include "ui_vis.h"
 #include "main.h"
 #include "util.h"
-#include "strings.h"
 #include "playback.h"
-#include <string.h>
-#include <ctype.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtkimage.h>
-
-#define UI_TYPE_VIS           (ui_vis_get_type())
 
 static const gfloat vis_afalloff_speeds[] = { 0.34, 0.5, 1.0, 1.3, 1.6 };
 static const gfloat vis_pfalloff_speeds[] = { 1.2, 1.3, 1.4, 1.5, 1.6 };
--- a/src/audacious/ui_vis.h	Thu Jul 19 13:51:37 2007 +0200
+++ b/src/audacious/ui_vis.h	Thu Jul 19 16:21:31 2007 +0200
@@ -19,10 +19,6 @@
 #ifndef UIVIS_H
 #define UIVIS_H
 
-#include <gdk/gdk.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif