*** src/gui_gtk_x11.c	2012-02-05 01:18:48.000000000 +0100
--- src/gui_gtk_x11_modif.c	2012-07-24 09:15:24.478253757 +0200
***************
*** 2615,2622 ****
      height += get_item_dimensions(gui.toolbar, GTK_ORIENTATION_HORIZONTAL);
  #endif
  #ifdef FEAT_GUI_TABLINE
!     if (gui.tabline != NULL)
! 	height += get_item_dimensions(gui.tabline, GTK_ORIENTATION_HORIZONTAL);
  #endif
  
      return height;
--- 2615,2623 ----
      height += get_item_dimensions(gui.toolbar, GTK_ORIENTATION_HORIZONTAL);
  #endif
  #ifdef FEAT_GUI_TABLINE
! // !!!EDIT
! //     if (gui.tabline != NULL)
! // 	height += get_item_dimensions(gui.tabline, GTK_ORIENTATION_HORIZONTAL);
  #endif
  
      return height;
***************
*** 2980,2987 ****
--- 2981,2990 ----
  	    page = gtk_vbox_new(FALSE, 0);
  	    gtk_widget_show(page);
  	    event_box = gtk_event_box_new();
+             gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box),FALSE); //EDIT 
  	    gtk_widget_show(event_box);
  	    label = gtk_label_new("-Empty-");
+             gtk_label_set_max_width_chars(GTK_LABEL(label),20); //EDIT  
  	    gtk_misc_set_padding(GTK_MISC(label), 2, 2);
  	    gtk_container_add(GTK_CONTAINER(event_box), label);
  	    gtk_widget_show(label);
***************
*** 3102,3107 ****
--- 3105,3111 ----
  gui_mch_init(void)
  {
      GtkWidget *vbox;
+     GtkWidget *hbox; //EDIT
  
  #ifdef FEAT_GUI_GNOME
      /* Initialize the GNOME libraries.	gnome_program_init()/gnome_init()
***************
*** 3319,3331 ****
       * default.
       */
      gui.tabline = gtk_notebook_new();
!     gtk_widget_show(gui.tabline);
!     gtk_box_pack_start(GTK_BOX(vbox), gui.tabline, FALSE, FALSE, 0);
!     gtk_notebook_set_show_border(GTK_NOTEBOOK(gui.tabline), FALSE);
      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gui.tabline), FALSE);
      gtk_notebook_set_scrollable(GTK_NOTEBOOK(gui.tabline), TRUE);
!     gtk_notebook_set_tab_border(GTK_NOTEBOOK(gui.tabline), FALSE);
! 
      tabline_tooltip = gtk_tooltips_new();
      gtk_tooltips_enable(GTK_TOOLTIPS(tabline_tooltip));
  
--- 3323,3339 ----
       * default.
       */
      gui.tabline = gtk_notebook_new();
! //     gtk_widget_show(gui.tabline);
! //     gtk_box_pack_start(GTK_BOX(vbox), gui.tabline, FALSE, FALSE, 0);  // EDIT 
! //     gtk_box_pack_start(GTK_BOX(hbox), gui.tabline, FALSE, FALSE, 0);  // EDIT 
!     gtk_notebook_set_show_border(GTK_NOTEBOOK(gui.tabline), TRUE);
      gtk_notebook_set_show_tabs(GTK_NOTEBOOK(gui.tabline), FALSE);
      gtk_notebook_set_scrollable(GTK_NOTEBOOK(gui.tabline), TRUE);
! //  EDIT
!      gtk_notebook_set_tab_border(GTK_NOTEBOOK(gui.tabline), FALSE);
!      gtk_notebook_set_tab_pos(GTK_NOTEBOOK(gui.tabline),GTK_POS_LEFT);
!     gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(gui.tabline),TRUE);
!     
      tabline_tooltip = gtk_tooltips_new();
      gtk_tooltips_enable(GTK_TOOLTIPS(tabline_tooltip));
  
***************
*** 3333,3349 ****
  	GtkWidget *page, *label, *event_box;
  
  	/* Add the first tab. */
! 	page = gtk_vbox_new(FALSE, 0);
! 	gtk_widget_show(page);
  	gtk_container_add(GTK_CONTAINER(gui.tabline), page);
  	label = gtk_label_new("-Empty-");
! 	gtk_widget_show(label);
  	event_box = gtk_event_box_new();
! 	gtk_widget_show(event_box);
  	gtk_object_set_user_data(GTK_OBJECT(event_box), (gpointer)1L);
  	gtk_misc_set_padding(GTK_MISC(label), 2, 2);
  	gtk_container_add(GTK_CONTAINER(event_box), label);
  	gtk_notebook_set_tab_label(GTK_NOTEBOOK(gui.tabline), page, event_box);
      }
  
      gtk_signal_connect(GTK_OBJECT(gui.tabline), "switch_page",
--- 3341,3361 ----
  	GtkWidget *page, *label, *event_box;
  
  	/* Add the first tab. */
! 	page = gtk_hbox_new(FALSE, 0); //EDIT used to be vbox
!  	gtk_widget_show(page);
  	gtk_container_add(GTK_CONTAINER(gui.tabline), page);
  	label = gtk_label_new("-Empty-");
!         gtk_label_set_max_width_chars(GTK_LABEL(label),20); //EDIT 
!  	gtk_widget_show(label);
  	event_box = gtk_event_box_new();
!  	gtk_widget_show(event_box);
!         gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box),FALSE); //EDIT 
  	gtk_object_set_user_data(GTK_OBJECT(event_box), (gpointer)1L);
  	gtk_misc_set_padding(GTK_MISC(label), 2, 2);
  	gtk_container_add(GTK_CONTAINER(event_box), label);
  	gtk_notebook_set_tab_label(GTK_NOTEBOOK(gui.tabline), page, event_box);
+         //EDIT unfortunately it doesn't work
+ //         gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(gui.tabline), page, TRUE);
      }
  
      gtk_signal_connect(GTK_OBJECT(gui.tabline), "switch_page",
***************
*** 3376,3383 ****
  
      gtk_widget_show(gui.drawarea);
      gtk_form_put(GTK_FORM(gui.formwin), gui.drawarea, 0, 0);
      gtk_widget_show(gui.formwin);
!     gtk_box_pack_start(GTK_BOX(vbox), gui.formwin, TRUE, TRUE, 0);
  
      /* For GtkSockets, key-presses must go to the focus widget (drawarea)
       * and not the window. */
--- 3388,3409 ----
  
      gtk_widget_show(gui.drawarea);
      gtk_form_put(GTK_FORM(gui.formwin), gui.drawarea, 0, 0);
+     GtkWidget *vboxtab; //EDIT
+ 
+     hbox = gtk_hbox_new(FALSE, 0);
+     vboxtab = gtk_vbox_new(FALSE, 0);
+     
+     gtk_box_pack_start(GTK_BOX(vboxtab), gui.tabline, TRUE, TRUE, 0);  // EDIT   //TABLINE
+     gtk_widget_show(gui.tabline);
+ 
+     gtk_box_pack_start(GTK_BOX(hbox), vboxtab, FALSE,FALSE, 0); // EDIT    // TAB BOX
+     gtk_widget_show(vboxtab);
+ 
+     gtk_box_pack_start(GTK_BOX(hbox), gui.formwin, TRUE, TRUE, 0); // EDIT    // EDITOR
      gtk_widget_show(gui.formwin);
! 
!     gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); // EDIT
!     gtk_widget_show(hbox);  //EDIT
  
      /* For GtkSockets, key-presses must go to the focus widget (drawarea)
       * and not the window. */