(nautilus_music_view_init): Use an EelBackgroundBox instead of a

2002-07-24  Dave Camp  <dave@ximian.com>

	(nautilus_music_view_init): Use an EelBackgroundBox instead of a
	GtkEventBox.
	* components/music/nautilus-music-view.c:
	* src/nautilus-sidebar.c: Derive from EelBackgroundBox instead of
	GtkEventBox.
	(nautilus_sidebar_style_set): Removed special case for
	EelBackgroundStyle.

8 files changed, 29 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d51bf0ac..545b4441a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-24  Dave Camp  <dave@ximian.com>
+
+	(nautilus_music_view_init): Use an EelBackgroundBox instead of a
+	GtkEventBox.
+	* components/music/nautilus-music-view.c:
+	* src/nautilus-sidebar.c: Derive from EelBackgroundBox instead of
+	GtkEventBox.
+	(nautilus_sidebar_style_set): Removed special case for
+	EelBackgroundStyle.
+
 2002-07-24  Michael Meeks  <michael@ximian.com>
 
 	* src/nautilus-window-manage-views.c
diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c
index ec18606f5..c87a3ba6f 100644
--- a/components/hardware/nautilus-hardware-view.c
+++ b/components/hardware/nautilus-hardware-view.c
@@ -93,7 +93,7 @@ static void hardware_view_load_location_callback      (NautilusView
 static char* make_summary_string		      (NautilusHardwareView	 *hardware_view);
 static int  update_uptime_text			      (gpointer			 callback_data);
 
-EEL_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, GTK_TYPE_EVENT_BOX)
+EEL_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, EEL_TYPE_BACKGROUND_BOX)
 
 static void
 nautilus_hardware_view_class_init (NautilusHardwareViewClass *klass)
diff --git a/components/hardware/nautilus-hardware-view.h b/components/hardware/nautilus-hardware-view.h
index c703ad378..727da068c 100644
--- a/components/hardware/nautilus-hardware-view.h
+++ b/components/hardware/nautilus-hardware-view.h
@@ -26,7 +26,7 @@
 #define NAUTILUS_HARDWARE_VIEW_H
 
 #include <libnautilus/nautilus-view.h>
-#include <gtk/gtkeventbox.h>
+#include <eel/eel-background-box.h>
 
 
 typedef struct _NautilusHardwareView      NautilusHardwareView;
@@ -41,12 +41,12 @@ typedef struct _NautilusHardwareViewClass NautilusHardwareViewClass;
 typedef struct _NautilusHardwareViewDetails NautilusHardwareViewDetails;
 
 struct _NautilusHardwareView {
-	GtkEventBox parent;
+	EelBackgroundBox parent;
 	NautilusHardwareViewDetails *details;
 };
 
 struct _NautilusHardwareViewClass {
-	GtkEventBoxClass parent_class;
+	EelBackgroundBoxClass parent_class;
 };
 
 /* GtkObject support */
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index d34108010..4b75f5054 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -34,6 +34,7 @@
 #include "pixmaps.h"
 #include <eel/eel-accessibility.h>
 #include <eel/eel-background.h>
+#include <eel/eel-background-box.h>
 #include <eel/eel-gdk-extensions.h>
 #include <eel/eel-gdk-pixbuf-extensions.h>
 #include <eel/eel-glib-extensions.h>
@@ -49,7 +50,6 @@
 #include <gtk/gtkadjustment.h>
 #include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkeventbox.h>
 #include <gtk/gtkfilesel.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkhscale.h>
@@ -411,7 +411,8 @@ nautilus_music_view_init (NautilusMusicView *music_view)
 	
 	music_view->details = g_new0 (NautilusMusicViewDetails, 1);
 
-        music_view->details->event_box = gtk_event_box_new ();
+
+        music_view->details->event_box = eel_background_box_new ();
         gtk_widget_show (music_view->details->event_box);
         
         g_signal_connect_object (music_view->details->event_box, "drag_data_received",
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index ca327ce90..86f305535 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -38,7 +38,6 @@
 #include <bonobo/bonobo-exception.h>
 
 #include <eel/eel-background.h>
-#include <eel/eel-background-style.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
@@ -178,7 +177,7 @@ typedef enum {
 	TABS_PART
 } SidebarPart;
 
-EEL_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_BOX)
+EEL_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, EEL_TYPE_BACKGROUND_BOX)
 
 /* initializing the class object by installing the operations we override */
 static void
@@ -1713,15 +1712,10 @@ static void
 nautilus_sidebar_style_set (GtkWidget *widget, GtkStyle *previous_style)
 {
 	NautilusSidebar *sidebar;
-	GtkStyle *style;
 
 	sidebar = NAUTILUS_SIDEBAR (widget);
 
-	style = gtk_widget_get_style (widget);
-
-	/* This is slightly hackish */
-	if (!EEL_IS_BACKGROUND_STYLE (style))
-		nautilus_sidebar_theme_changed (sidebar);
+	nautilus_sidebar_theme_changed (sidebar);
 }
 
 void
diff --git a/src/nautilus-information-panel.h b/src/nautilus-information-panel.h
index 9c7a5c0db..d3c48b4b9 100644
--- a/src/nautilus-information-panel.h
+++ b/src/nautilus-information-panel.h
@@ -28,7 +28,8 @@
 #ifndef NAUTILUS_SIDEBAR_H
 #define NAUTILUS_SIDEBAR_H
 
-#include <gtk/gtkeventbox.h>
+#include <eel/eel-background-box.h>
+
 #include "nautilus-view-frame.h"
 
 #define NAUTILUS_TYPE_SIDEBAR \
@@ -45,12 +46,12 @@
 typedef struct NautilusSidebarDetails NautilusSidebarDetails;
 
 typedef struct {
-	GtkEventBox parent_slot;
+	EelBackgroundBox parent_slot;
 	NautilusSidebarDetails *details;
 } NautilusSidebar;
 
 typedef struct {
-	GtkEventBoxClass parent_slot;
+	EelBackgroundBoxClass parent_slot;
 	
 	void (*location_changed) (NautilusSidebar *sidebar,
 				  const char *location);
diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c
index ca327ce90..86f305535 100644
--- a/src/nautilus-sidebar.c
+++ b/src/nautilus-sidebar.c
@@ -38,7 +38,6 @@
 #include <bonobo/bonobo-exception.h>
 
 #include <eel/eel-background.h>
-#include <eel/eel-background-style.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
@@ -178,7 +177,7 @@ typedef enum {
 	TABS_PART
 } SidebarPart;
 
-EEL_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_BOX)
+EEL_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, EEL_TYPE_BACKGROUND_BOX)
 
 /* initializing the class object by installing the operations we override */
 static void
@@ -1713,15 +1712,10 @@ static void
 nautilus_sidebar_style_set (GtkWidget *widget, GtkStyle *previous_style)
 {
 	NautilusSidebar *sidebar;
-	GtkStyle *style;
 
 	sidebar = NAUTILUS_SIDEBAR (widget);
 
-	style = gtk_widget_get_style (widget);
-
-	/* This is slightly hackish */
-	if (!EEL_IS_BACKGROUND_STYLE (style))
-		nautilus_sidebar_theme_changed (sidebar);
+	nautilus_sidebar_theme_changed (sidebar);
 }
 
 void
diff --git a/src/nautilus-sidebar.h b/src/nautilus-sidebar.h
index 9c7a5c0db..d3c48b4b9 100644
--- a/src/nautilus-sidebar.h
+++ b/src/nautilus-sidebar.h
@@ -28,7 +28,8 @@
 #ifndef NAUTILUS_SIDEBAR_H
 #define NAUTILUS_SIDEBAR_H
 
-#include <gtk/gtkeventbox.h>
+#include <eel/eel-background-box.h>
+
 #include "nautilus-view-frame.h"
 
 #define NAUTILUS_TYPE_SIDEBAR \
@@ -45,12 +46,12 @@
 typedef struct NautilusSidebarDetails NautilusSidebarDetails;
 
 typedef struct {
-	GtkEventBox parent_slot;
+	EelBackgroundBox parent_slot;
 	NautilusSidebarDetails *details;
 } NautilusSidebar;
 
 typedef struct {
-	GtkEventBoxClass parent_slot;
+	EelBackgroundBoxClass parent_slot;
 	
 	void (*location_changed) (NautilusSidebar *sidebar,
 				  const char *location);