Remove member `hbox' from `struct _EShellFolderTitleBarPrivate'.

* e-shell-folder-title-bar.c: Remove member `hbox' from `struct
_EShellFolderTitleBarPrivate'.
(make_icon_pixmap): Removed.
(rgb_from_gdk_color): Removed.
(endarken_style): Removed.
(set_style_cb): Removed.
(create_arrow_pixmap): Renamed from `create_icon_pixmap'.
(get_max_clipped_label_width): New helper function.
(size_allocate_icon): New helper function.
(size_allocate_button): New helper function.
(size_allocate_label): New helper function.
(add_icon_widget): New helper function.
(realize): Changed to use `add_icon_widget()'.
(size_allocate): New function, handler for the ::size_allocate
method.
(class_init): Install it.
(e_shell_folder_title_bar_construct): Changed so that the widget
get added to this widget instead of adding an hbox to it and
adding the widgets to the hbox.
(e_shell_folder_title_bar_set_icon): Changed to use
`add_icon_widget()'.

* e-shell-folder-title-bar.h, e-shell-folder-title-bar.c: Changed
to derive from GtkHBox, not GtkEventBox.

svn path=/trunk/; revision=11718

1 files changed, 13 insertions, 13 deletions

diff --git a/shell/e-shell-folder-title-bar.h b/shell/e-shell-folder-title-bar.h
index f3a8e0c110..3a15280d75 100644
--- a/shell/e-shell-folder-title-bar.h
+++ b/shell/e-shell-folder-title-bar.h
@@ -24,7 +24,7 @@
 #ifndef __E_SHELL_FOLDER_TITLE_BAR_H__
 #define __E_SHELL_FOLDER_TITLE_BAR_H__
 
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtkhbox.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #ifdef __cplusplus
@@ -44,13 +44,13 @@ typedef struct _EShellFolderTitleBarPrivate EShellFolderTitleBarPrivate;
 typedef struct _EShellFolderTitleBarClass   EShellFolderTitleBarClass;
 
 struct _EShellFolderTitleBar {
-	GtkEventBox parent;
+	GtkHBox parent;
 
 	EShellFolderTitleBarPrivate *priv;
 };
 
 struct _EShellFolderTitleBarClass {
-	GtkEventBoxClass parent_class;
+	GtkHBoxClass parent_class;
 
 	/* Signals.  */
 	void  (* title_toggled)  (EShellFolderTitleBar *folder_title_bar, gboolean pressed);
@@ -61,16 +61,16 @@ GtkType    e_shell_folder_title_bar_get_type          (void);
 void       e_shell_folder_title_bar_construct         (EShellFolderTitleBar *folder_title_bar);
 GtkWidget *e_shell_folder_title_bar_new               (void);
 
-void       e_shell_folder_title_bar_set_title         (EShellFolderTitleBar *folder_title_bar,
-						       const char           *title);
-void       e_shell_folder_title_bar_set_folder_bar_label   (EShellFolderTitleBar *folder_title_bar,
-							    const char           *folder_bar_label);
-void       e_shell_folder_title_bar_set_icon          (EShellFolderTitleBar *folder_title_bar,
-						       const GdkPixbuf      *icon);
-void       e_shell_folder_title_bar_set_toggle_state  (EShellFolderTitleBar *folder_title_bar,
-						       gboolean              state);
-void       e_shell_folder_title_bar_set_clickable     (EShellFolderTitleBar *folder_title_bar,
-						       gboolean              clickable);
+void  e_shell_folder_title_bar_set_title             (EShellFolderTitleBar *folder_title_bar,
+						      const char           *title);
+void  e_shell_folder_title_bar_set_folder_bar_label  (EShellFolderTitleBar *folder_title_bar,
+						      const char           *folder_bar_label);
+void  e_shell_folder_title_bar_set_icon              (EShellFolderTitleBar *folder_title_bar,
+						      const GdkPixbuf      *icon);
+void  e_shell_folder_title_bar_set_toggle_state      (EShellFolderTitleBar *folder_title_bar,
+						      gboolean              state);
+void  e_shell_folder_title_bar_set_clickable         (EShellFolderTitleBar *folder_title_bar,
+						      gboolean              clickable);
 
 #ifdef __cplusplus
 }