Index: gcalctool/gtk.c
===================================================================
RCS file: /cvs/gnome/gcalctool/gcalctool/gtk.c,v
retrieving revision 1.109
diff -u -r1.109 gtk.c
--- gcalctool/gtk.c	22 Jan 2004 17:50:58 -0000	1.109
+++ gcalctool/gtk.c	26 Jan 2004 14:34:16 -0000
@@ -76,6 +76,7 @@
     GdkPixbuf *icon;                   /* Main window icon. */
     GtkWidget *menubar;
     GtkWidget *mode_panel;
+    GtkWidget *mode_panel_separator;
     GtkWidget *display_item;           /* Calculator display. */
     GtkWidget *rframe;                 /* Register window. */
     GtkWidget *regs[MAXREGS];          /* Memory registers. */
@@ -86,9 +87,11 @@
     GtkWidget *fin_buttons[FROWS * FCOLS];
     GtkWidget *sci_buttons[SROWS * SCOLS];
 
-    GtkWidget *bas_frame;
-    GtkWidget *fin_frame;
-    GtkWidget *sci_frame;
+    GtkWidget *bas_panel;
+    GtkWidget *fin_panel;
+    GtkWidget *fin_panel_separator;
+    GtkWidget *sci_panel;
+    GtkWidget *sci_panel_separator;
 
     Display *dpy;
 
@@ -117,7 +120,7 @@
 static GtkWidget *create_menu(enum menu_type, struct button *);
 static GtkWidget *create_mode_panel(GtkWidget *);
 static GtkWidget *make_menu_button(gchar *, int);
-static GtkWidget *make_but_frame(GtkWidget *, GtkWidget **,
+static GtkWidget *make_but_panel(GtkWidget *, GtkWidget **,
                                  struct button *, int, int, char *);
 
 static char *make_hostname(Display *);
@@ -860,18 +863,33 @@
     gtk_widget_realize(X->kframe);
     gtk_window_set_title(GTK_WINDOW(X->kframe), _(v->tool_label));
 
-    X->fin_frame = make_but_frame(X->kvbox, X->fin_buttons,
+    X->fin_panel = make_but_panel(X->kvbox, X->fin_buttons,
                                   f_buttons, FROWS, FCOLS, "fin");
+    X->fin_panel_separator = gtk_hseparator_new ();
+    gtk_box_pack_start (GTK_BOX(X->kvbox), X->fin_panel_separator,
+			FALSE, FALSE, 0);
+
     X->mode_panel = create_mode_panel(X->kvbox);
-    X->sci_frame = make_but_frame(X->kvbox, X->sci_buttons,
+    X->mode_panel_separator = gtk_hseparator_new ();
+    gtk_box_pack_start (GTK_BOX(X->kvbox), X->mode_panel_separator,
+			FALSE, FALSE, 0);
+
+    X->sci_panel = make_but_panel(X->kvbox, X->sci_buttons,
                                   s_buttons, SROWS, SCOLS, "sci");
-    gtk_widget_show(X->fin_frame);
+    X->sci_panel_separator = gtk_hseparator_new ();
+    gtk_box_pack_start (GTK_BOX(X->kvbox), X->sci_panel_separator,
+			FALSE, FALSE, 0);
+
+    gtk_widget_show(X->fin_panel);
+    gtk_widget_show(X->fin_panel_separator);
     gtk_widget_show(X->mode_panel);
-    gtk_widget_show(X->sci_frame);
+    gtk_widget_show(X->mode_panel_separator);
+    gtk_widget_show(X->sci_panel);
+    gtk_widget_show(X->sci_panel_separator);
 
-    X->bas_frame = make_but_frame(X->kvbox, X->bas_buttons,
+    X->bas_panel = make_but_panel(X->kvbox, X->bas_buttons,
                                   &b_buttons[0], BROWS, BCOLS, "bas");
-    gtk_widget_show(X->bas_frame);
+    gtk_widget_show(X->bas_panel);
     gtk_window_add_accel_group(GTK_WINDOW(X->kframe), X->kbd_accel);
     grey_buttons(v->base);
     gtk_window_set_icon(GTK_WINDOW(X->kframe), X->icon);
@@ -920,21 +938,17 @@
     int i;
     AtkObject *access_object;
     GtkWidget *base_hbox, *disp_hbox, *trig_hbox;
-    GtkWidget *row1_hbox, *row2_hbox, *frame, *vbox;
+    GtkWidget *row1_hbox, *row2_hbox, *vbox;
     GSList *base_gr = NULL;
     GSList *disp_gr = NULL;
     GSList *trig_gr = NULL;
 
-    frame = gtk_frame_new(NULL);
-    gtk_widget_show(frame);
-    gtk_container_set_border_width(GTK_CONTAINER(frame), 2);
-    gtk_box_pack_start(GTK_BOX(main_vbox), frame, FALSE, TRUE, 0);
-
     row1_hbox = gtk_hbox_new(FALSE, 0);
     row2_hbox = gtk_hbox_new(FALSE, 0);
 
     vbox = gtk_vbox_new(FALSE, 0);
     gtk_widget_ref(vbox);
+    gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
 
 /* Make Trig. type radio button widgets. */
  
@@ -1019,9 +1033,9 @@
 
     gtk_box_pack_start(GTK_BOX(vbox), row1_hbox, FALSE, FALSE, 0);
     gtk_box_pack_start(GTK_BOX(vbox), row2_hbox, FALSE, FALSE, 0);
-    gtk_container_add(GTK_CONTAINER(frame), vbox);
+    gtk_box_pack_start(GTK_BOX(main_vbox), vbox, FALSE, TRUE, 0);
 
-    return(frame);
+    return(vbox);
 }
 
 
@@ -1457,22 +1471,21 @@
 
 
 static GtkWidget *
-make_but_frame(GtkWidget *vbox, GtkWidget **Gtk_buttons,
+make_but_panel(GtkWidget *vbox, GtkWidget **Gtk_buttons,
                struct button buttons[], int rows, int cols, char *tag)
 {
     char *label, name[MAXLINE];
     int i, j, n;
-    GtkWidget *frame, *l;
+    GtkWidget *l;
     GtkWidget *table = gtk_table_new(rows, cols, TRUE);
 
-    frame = gtk_frame_new(NULL);
-    gtk_widget_show(frame);
-    gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
+    gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+    gtk_table_set_col_spacings (GTK_TABLE (table), 6);
+    gtk_container_set_border_width (GTK_CONTAINER (table), 6);
 
     gtk_widget_ref(table);
     gtk_widget_show(table);
-    gtk_container_set_border_width(GTK_CONTAINER(frame), 2);
-    gtk_container_add(GTK_CONTAINER(frame), table);
+    gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0);
 
     for (i = 0; i < cols; i++) {
         for (j = 0; j < rows; j++) {
@@ -1509,11 +1522,11 @@
                      i, i+1, j, j+1,
                      (GtkAttachOptions) (GTK_EXPAND | GTK_FILL | GTK_SHRINK),
                      (GtkAttachOptions) (GTK_EXPAND | GTK_FILL | GTK_SHRINK),
-                     4, 4);
+                     0, 0);
         }
     }
 
-    return(frame);
+    return(table);
 }
 
 
@@ -1962,21 +1975,30 @@
 
     switch (mode) {
         case BASIC:
-            gtk_widget_hide(X->fin_frame);
+            gtk_widget_hide(X->fin_panel);
+            gtk_widget_hide(X->fin_panel_separator);
             gtk_widget_hide(X->mode_panel);
-            gtk_widget_hide(X->sci_frame);
+            gtk_widget_hide(X->mode_panel_separator);
+            gtk_widget_hide(X->sci_panel);
+            gtk_widget_hide(X->sci_panel_separator);
             break;
 
         case FINANCIAL:
-            gtk_widget_show(X->fin_frame);
+            gtk_widget_show(X->fin_panel);
+            gtk_widget_show(X->fin_panel_separator);
             gtk_widget_hide(X->mode_panel);
-            gtk_widget_hide(X->sci_frame);
+            gtk_widget_hide(X->mode_panel_separator);
+            gtk_widget_hide(X->sci_panel);
+            gtk_widget_hide(X->sci_panel_separator);
             break;
 
         case SCIENTIFIC:
-            gtk_widget_hide(X->fin_frame);
+            gtk_widget_hide(X->fin_panel);
+            gtk_widget_hide(X->fin_panel_separator);
             gtk_widget_show_all(X->mode_panel);
-            gtk_widget_show(X->sci_frame);
+            gtk_widget_show(X->mode_panel_separator);
+            gtk_widget_show(X->sci_panel);
+            gtk_widget_show(X->sci_panel_separator);
             break;
     }
 
@@ -1987,20 +2009,26 @@
     gtk_widget_size_request(X->display_item, r);
     w = MAX(w, r->width);
     h += r->height;
-    if (GTK_WIDGET_VISIBLE(X->fin_frame)) {
-        gtk_widget_size_request(X->fin_frame, r);
+    if (GTK_WIDGET_VISIBLE(X->fin_panel)) {
+        gtk_widget_size_request(X->fin_panel, r);
         w = MAX(w, r->width);
         h += r->height;
+        gtk_widget_size_request(X->fin_panel_separator, r);
+        h += r->height;
     }
     if (GTK_WIDGET_VISIBLE(X->mode_panel)) {
         gtk_widget_size_request(X->mode_panel, r);
         w = MAX(w, r->width);
         h += r->height;
+        gtk_widget_size_request(X->mode_panel_separator, r);
+        h += r->height;
     }
-    if (GTK_WIDGET_VISIBLE(X->sci_frame)) {
-        gtk_widget_size_request(X->sci_frame, r);
+    if (GTK_WIDGET_VISIBLE(X->sci_panel)) {
+        gtk_widget_size_request(X->sci_panel, r);
         w = MAX(w, r->width);
     	h += r->height;
+        gtk_widget_size_request(X->sci_panel_separator, r);
+    	h += r->height;
     }
     
     /* For initial display. */
