diff --git a/ChangeLog b/ChangeLog index ebf52f9c5..f60549f9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Nov 12 00:26:13 1998 Lars Hamann + + * gtk/gtkstyle.c (gtk_default_draw_box_gap): use GtkPositionType + defines. + + * gtk/gtknotebook.c (gtk_notebook_draw_tab): fixed gap_side for + GTP_POS_RIGHT + Wed Nov 11 19:54:58 1998 Lars Hamann * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ebf52f9c5..f60549f9a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Thu Nov 12 00:26:13 1998 Lars Hamann + + * gtk/gtkstyle.c (gtk_default_draw_box_gap): use GtkPositionType + defines. + + * gtk/gtknotebook.c (gtk_notebook_draw_tab): fixed gap_side for + GTP_POS_RIGHT + Wed Nov 11 19:54:58 1998 Lars Hamann * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ebf52f9c5..f60549f9a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Thu Nov 12 00:26:13 1998 Lars Hamann + + * gtk/gtkstyle.c (gtk_default_draw_box_gap): use GtkPositionType + defines. + + * gtk/gtknotebook.c (gtk_notebook_draw_tab): fixed gap_side for + GTP_POS_RIGHT + Wed Nov 11 19:54:58 1998 Lars Hamann * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ebf52f9c5..f60549f9a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Thu Nov 12 00:26:13 1998 Lars Hamann + + * gtk/gtkstyle.c (gtk_default_draw_box_gap): use GtkPositionType + defines. + + * gtk/gtknotebook.c (gtk_notebook_draw_tab): fixed gap_side for + GTP_POS_RIGHT + Wed Nov 11 19:54:58 1998 Lars Hamann * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ebf52f9c5..f60549f9a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Thu Nov 12 00:26:13 1998 Lars Hamann + + * gtk/gtkstyle.c (gtk_default_draw_box_gap): use GtkPositionType + defines. + + * gtk/gtknotebook.c (gtk_notebook_draw_tab): fixed gap_side for + GTP_POS_RIGHT + Wed Nov 11 19:54:58 1998 Lars Hamann * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ebf52f9c5..f60549f9a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Thu Nov 12 00:26:13 1998 Lars Hamann + + * gtk/gtkstyle.c (gtk_default_draw_box_gap): use GtkPositionType + defines. + + * gtk/gtknotebook.c (gtk_notebook_draw_tab): fixed gap_side for + GTP_POS_RIGHT + Wed Nov 11 19:54:58 1998 Lars Hamann * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ebf52f9c5..f60549f9a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Thu Nov 12 00:26:13 1998 Lars Hamann + + * gtk/gtkstyle.c (gtk_default_draw_box_gap): use GtkPositionType + defines. + + * gtk/gtknotebook.c (gtk_notebook_draw_tab): fixed gap_side for + GTP_POS_RIGHT + Wed Nov 11 19:54:58 1998 Lars Hamann * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index e10724624..536afd079 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -2295,7 +2295,7 @@ gtk_notebook_draw_tab (GtkNotebook *notebook, gap_side = GTK_POS_RIGHT; break; case GTK_POS_RIGHT: - gap_side = GTK_POS_RIGHT; + gap_side = GTK_POS_LEFT; break; } diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index 8f4fc5f61..07e2ee743 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -2613,9 +2613,9 @@ gtk_default_draw_box_gap (GtkStyle *style, case GTK_SHADOW_OUT: case GTK_SHADOW_ETCHED_IN: case GTK_SHADOW_ETCHED_OUT: - if (gap_side == 0) - /* top */ + switch (gap_side) { + case GTK_POS_TOP: gdk_draw_line (window, gc1, x, y, x, y + height - 1); gdk_draw_line (window, gc2, @@ -2647,10 +2647,8 @@ gtk_default_draw_box_gap (GtkStyle *style, gdk_draw_line (window, gc2, x + gap_x + gap_width - 1, y, x + gap_x + gap_width - 1, y); } - } - else if (gap_side == 1) - /* bottom */ - { + break; + case GTK_POS_BOTTOM: gdk_draw_line (window, gc1, x, y, x + width - 1, y); gdk_draw_line (window, gc1, @@ -2682,10 +2680,8 @@ gtk_default_draw_box_gap (GtkStyle *style, gdk_draw_line (window, gc3, x + gap_x + gap_width - 1, y + height - 1, x + gap_x + gap_width - 1, y + height - 1); } - } - else if (gap_side == 2) - /* left */ - { + break; + case GTK_POS_LEFT: gdk_draw_line (window, gc1, x, y, x + width - 1, y); gdk_draw_line (window, gc2, @@ -2717,10 +2713,8 @@ gtk_default_draw_box_gap (GtkStyle *style, gdk_draw_line (window, gc2, x, y + gap_x + gap_width - 1, x, y + gap_x + gap_width - 1); } - } - else if (gap_side == 3) - /* right */ - { + break; + case GTK_POS_RIGHT: gdk_draw_line (window, gc1, x, y, x + width - 1, y); gdk_draw_line (window, gc1, @@ -2752,6 +2746,7 @@ gtk_default_draw_box_gap (GtkStyle *style, gdk_draw_line (window, gc3, x + width - 1, y + gap_x + gap_width - 1, x + width - 1, y + gap_x + gap_width - 1); } + break; } } if (area)