[Adonthell-commits] CVS: adonthell/src/tools/dlgedit gui_settings.cc,1.8,1.9

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src/tools/dlgedit
In directory subversions:/tmp/cvs-serv19025

Modified Files:
        gui_settings.cc 
Log Message:
CHANGED order of buttons to match rest of dlgedit
REMOVED vbox that wasn't required


Index: gui_settings.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/gui_settings.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** gui_settings.cc     22 Oct 2002 15:20:40 -0000      1.8
--- gui_settings.cc     26 Oct 2002 22:44:51 -0000      1.9
***************
*** 104,108 ****
  GuiSettings::GuiSettings ()
  {
!     GtkWidget *vbox, *vbox1;
      GtkWidget *frame;
      GtkWidget *table;
--- 104,108 ----
  GuiSettings::GuiSettings ()
  {
!     GtkWidget *vbox;
      GtkWidget *frame;
      GtkWidget *table;
***************
*** 140,154 ****
      gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
  
-     vbox1 = gtk_vbox_new (FALSE, 0);
-     gtk_widget_ref (vbox1);
-     gtk_object_set_data_full (GTK_OBJECT (window), "vbox1", vbox1, 
(GtkDestroyNotify) gtk_widget_unref);
-     gtk_widget_show (vbox1);
-     gtk_container_add (GTK_CONTAINER (frame), vbox1);
- 
      table = gtk_table_new (2, 2, FALSE);
      gtk_widget_ref (table);
      gtk_object_set_data_full (GTK_OBJECT (window), "table", table, 
(GtkDestroyNotify) gtk_widget_unref);
      gtk_widget_show (table);
!     gtk_box_pack_start (GTK_BOX (vbox1), table, TRUE, TRUE, 0);
      gtk_container_set_border_width (GTK_CONTAINER (table), 4);
      gtk_table_set_col_spacings (GTK_TABLE (table), 8);
--- 140,148 ----
      gtk_container_set_border_width (GTK_CONTAINER (frame), 4);
  
      table = gtk_table_new (2, 2, FALSE);
      gtk_widget_ref (table);
      gtk_object_set_data_full (GTK_OBJECT (window), "table", table, 
(GtkDestroyNotify) gtk_widget_unref);
      gtk_widget_show (table);
!     gtk_container_add (GTK_CONTAINER (frame), table);
      gtk_container_set_border_width (GTK_CONTAINER (table), 4);
      gtk_table_set_col_spacings (GTK_TABLE (table), 8);
***************
*** 257,261 ****
      gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 0);
  
!     button = gtk_button_new_with_label ("Cancel");
      gtk_widget_ref (button);
      gtk_object_set_data_full (GTK_OBJECT (window), "button", button, 
(GtkDestroyNotify) gtk_widget_unref);
--- 251,255 ----
      gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox), 0);
  
!     button = gtk_button_new_with_label ("Apply");
      gtk_widget_ref (button);
      gtk_object_set_data_full (GTK_OBJECT (window), "button", button, 
(GtkDestroyNotify) gtk_widget_unref);
***************
*** 263,269 ****
      gtk_container_add (GTK_CONTAINER (hbuttonbox), button);
      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
!     gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC 
(on_close_settings), NULL);
  
!     button = gtk_button_new_with_label ("Apply");
      gtk_widget_ref (button);
      gtk_object_set_data_full (GTK_OBJECT (window), "button", button, 
(GtkDestroyNotify) gtk_widget_unref);
--- 257,263 ----
      gtk_container_add (GTK_CONTAINER (hbuttonbox), button);
      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
!     gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC 
(on_apply_button_clicked), this);
  
!     button = gtk_button_new_with_label ("OK");
      gtk_widget_ref (button);
      gtk_object_set_data_full (GTK_OBJECT (window), "button", button, 
(GtkDestroyNotify) gtk_widget_unref);
***************
*** 271,277 ****
      gtk_container_add (GTK_CONTAINER (hbuttonbox), button);
      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
!     gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC 
(on_apply_button_clicked), this);
  
!     button = gtk_button_new_with_label ("OK");
      gtk_widget_ref (button);
      gtk_object_set_data_full (GTK_OBJECT (window), "button", button, 
(GtkDestroyNotify) gtk_widget_unref);
--- 265,271 ----
      gtk_container_add (GTK_CONTAINER (hbuttonbox), button);
      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
!     gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC 
(on_ok_button_clicked), NULL);
  
!     button = gtk_button_new_with_label ("Cancel");
      gtk_widget_ref (button);
      gtk_object_set_data_full (GTK_OBJECT (window), "button", button, 
(GtkDestroyNotify) gtk_widget_unref);
***************
*** 279,283 ****
      gtk_container_add (GTK_CONTAINER (hbuttonbox), button);
      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
!     gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC 
(on_ok_button_clicked), NULL);
  
      gtk_object_set_data (GTK_OBJECT (window), "tooltips", tooltips);
--- 273,277 ----
      gtk_container_add (GTK_CONTAINER (hbuttonbox), button);
      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
!     gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC 
(on_close_settings), NULL);
  
      gtk_object_set_data (GTK_OBJECT (window), "tooltips", tooltips);