Make EphyTab inherit from GtkBin, and contain the EphyEmbed as its child.

2004-02-24  Christian Persch  <chpe@cvs.gnome.org>

	* src/ephy-nautilus-view.c: (gnv_embed_new_window_cb):
	* src/ephy-notebook.c: (ephy_notebook_class_init),
	(tab_label_size_request_cb), (ephy_notebook_move_tab), (move_tab),
	(motion_notify_cb), (move_tab_to_another_notebook),
	(button_release_cb), (ephy_notebook_switch_page_cb),
	(ephy_notebook_init), (close_button_clicked_cb), (build_tab_label),
	(ephy_notebook_insert_tab), (smart_tab_switching_on_closure),
	(ephy_notebook_remove_tab):
	* src/ephy-notebook.h:
	* src/ephy-session.c: (tab_added_cb), (tab_removed_cb):
	* src/ephy-shell.c: (ephy_shell_new_tab):
	* src/ephy-tab.c: (ephy_tab_get_type), (ephy_tab_size_allocate),
	(ephy_tab_parent_set), (ephy_tab_class_init), (ephy_tab_finalize),
	(ephy_tab_new), (ephy_tab_get_embed), (ephy_tab_for_embed),
	(ephy_tab_new_window_cb), (let_me_resize_hack),
	(ephy_tab_visibility_cb), (ephy_tab_size_to_cb),
	(ephy_tab_dom_mouse_click_cb), (ephy_tab_init),
	(ephy_tab_update_navigation_flags), (ephy_tab_set_title):
	* src/ephy-tab.h:
	* src/ephy-tabs-menu.c: (tab_added_cb), (tab_removed_cb),
	(tabs_reordered_cb), (ephy_tabs_menu_set_window),
	(ephy_tabs_menu_update):
	* src/ephy-window.c: (tab_added_cb), (tab_removed_cb),
	(tab_detached_cb), (tabs_reordered_cb), (tab_delete_cb),
	(setup_notebook), (ephy_window_add_tab), (ephy_window_jump_to_tab),
	(real_get_active_tab), (ephy_window_remove_tab),
	(ephy_window_get_active_tab), (ephy_window_get_active_embed),
	(ephy_window_get_tabs):
	* src/ephy-window.h:
	* src/window-commands.c: (window_cmd_tabs_move_left),
	(window_cmd_tabs_move_right), (window_cmd_tabs_detach):

	Make EphyTab inherit from GtkBin, and contain the EphyEmbed as its child.

1 files changed, 20 insertions, 23 deletions

diff --git a/src/ephy-notebook.h b/src/ephy-notebook.h
index 314ad098c..452fb10db 100644
--- a/src/ephy-notebook.h
+++ b/src/ephy-notebook.h
@@ -1,5 +1,7 @@
 /*
  *  Copyright (C) 2002 Christophe Fergeau
+ *  Copyright (C) 2003 Marco Pesenti Gritti
+ *  Copyright (C) 2003, 2004 Christian Persch
  *
  *  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
@@ -21,6 +23,8 @@
 #ifndef EPHY_NOTEBOOK_H
 #define EPHY_NOTEBOOK_H
 
+#include "ephy-tab.h"
+
 #include <glib.h>
 #include <gtk/gtknotebook.h>
 
@@ -33,21 +37,14 @@ G_BEGIN_DECLS
 #define EPHY_IS_NOTEBOOK_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_NOTEBOOK))
 #define EPHY_NOTEBOOK_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NOTEBOOK, EphyNotebookClass))
 
-typedef struct EphyNotebookClass EphyNotebookClass;
-typedef struct EphyNotebook EphyNotebook;
-typedef struct EphyNotebookPrivate EphyNotebookPrivate;
-
-typedef enum
-{
-	EPHY_NOTEBOOK_TAB_LOAD_NORMAL,
-	EPHY_NOTEBOOK_TAB_LOAD_LOADING,
-	EPHY_NOTEBOOK_TAB_LOAD_COMPLETED
-} EphyNotebookPageLoadStatus;
+typedef struct EphyNotebookClass	EphyNotebookClass;
+typedef struct EphyNotebook		EphyNotebook;
+typedef struct EphyNotebookPrivate	EphyNotebookPrivate;
 
 enum
 {
-	EPHY_NOTEBOOK_INSERT_LAST = -1,
-	EPHY_NOTEBOOK_INSERT_GROUPED = -2
+	EPHY_NOTEBOOK_INSERT_LAST	= -1,
+	EPHY_NOTEBOOK_INSERT_GROUPED	= -2
 };
 
 struct EphyNotebook
@@ -64,32 +61,32 @@ struct EphyNotebookClass
 
 	/* Signals */
 	void (* tab_added)      (EphyNotebook *notebook,
-				 GtkWidget *child);
+				 EphyTab *tab);
 	void (* tab_removed)    (EphyNotebook *notebook,
-				 GtkWidget *child);
+				 EphyTab *tab);
 	void (* tab_detached)   (EphyNotebook *notebook,
-				 GtkWidget *child);
+				 EphyTab *tab);
 	void (* tabs_reordered) (EphyNotebook *notebook);
 	void (* tab_delete)	(EphyNotebook *notebook,
-				 GtkWidget *child);
+				 EphyTab *tab);
 };
 
 GType		ephy_notebook_get_type		(void);
 
 GtkWidget      *ephy_notebook_new		(void);
 
-void		ephy_notebook_insert_page	(EphyNotebook *nb,
-						 GtkWidget *child,
+void		ephy_notebook_insert_tab	(EphyNotebook *nb,
+						 EphyTab *tab,
 						 int position,
 						 gboolean jump_to);
 
-void		ephy_notebook_remove_page	(EphyNotebook *nb,
-						 GtkWidget *child);
+void		ephy_notebook_remove_tab	(EphyNotebook *nb,
+						 EphyTab *tab);
 
-void            ephy_notebook_move_page         (EphyNotebook *src,
+void            ephy_notebook_move_tab		(EphyNotebook *src,
 						 EphyNotebook *dest,
-						 GtkWidget *src_page,
-						 gint dest_page);
+						 EphyTab *tab,
+						 int dest_position);
 
 void		ephy_notebook_set_show_tabs	(EphyNotebook *nb,
 						 gboolean show_tabs);