use GtkPositionType defines.

Thu Nov 12 00:26:13 1998  Lars Hamann  <lars@gtk.org>

	* 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
This commit is contained in:
Lars Hamann
1998-11-11 23:40:17 +00:00
committed by Lars Hamann
parent f164436f86
commit b214f7e59e
9 changed files with 66 additions and 15 deletions

View File

@ -1,3 +1,11 @@
Thu Nov 12 00:26:13 1998 Lars Hamann <lars@gtk.org>
* 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 <lars@gtk.org> Wed Nov 11 19:54:58 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init)

View File

@ -1,3 +1,11 @@
Thu Nov 12 00:26:13 1998 Lars Hamann <lars@gtk.org>
* 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 <lars@gtk.org> Wed Nov 11 19:54:58 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init)

View File

@ -1,3 +1,11 @@
Thu Nov 12 00:26:13 1998 Lars Hamann <lars@gtk.org>
* 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 <lars@gtk.org> Wed Nov 11 19:54:58 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init)

View File

@ -1,3 +1,11 @@
Thu Nov 12 00:26:13 1998 Lars Hamann <lars@gtk.org>
* 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 <lars@gtk.org> Wed Nov 11 19:54:58 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init)

View File

@ -1,3 +1,11 @@
Thu Nov 12 00:26:13 1998 Lars Hamann <lars@gtk.org>
* 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 <lars@gtk.org> Wed Nov 11 19:54:58 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init)

View File

@ -1,3 +1,11 @@
Thu Nov 12 00:26:13 1998 Lars Hamann <lars@gtk.org>
* 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 <lars@gtk.org> Wed Nov 11 19:54:58 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init)

View File

@ -1,3 +1,11 @@
Thu Nov 12 00:26:13 1998 Lars Hamann <lars@gtk.org>
* 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 <lars@gtk.org> Wed Nov 11 19:54:58 1998 Lars Hamann <lars@gtk.org>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init) * gtk/gtkscrolledwindow.c (gtk_scrolled_window_class_init)

View File

@ -2295,7 +2295,7 @@ gtk_notebook_draw_tab (GtkNotebook *notebook,
gap_side = GTK_POS_RIGHT; gap_side = GTK_POS_RIGHT;
break; break;
case GTK_POS_RIGHT: case GTK_POS_RIGHT:
gap_side = GTK_POS_RIGHT; gap_side = GTK_POS_LEFT;
break; break;
} }

View File

@ -2613,9 +2613,9 @@ gtk_default_draw_box_gap (GtkStyle *style,
case GTK_SHADOW_OUT: case GTK_SHADOW_OUT:
case GTK_SHADOW_ETCHED_IN: case GTK_SHADOW_ETCHED_IN:
case GTK_SHADOW_ETCHED_OUT: case GTK_SHADOW_ETCHED_OUT:
if (gap_side == 0) switch (gap_side)
/* top */
{ {
case GTK_POS_TOP:
gdk_draw_line (window, gc1, gdk_draw_line (window, gc1,
x, y, x, y + height - 1); x, y, x, y + height - 1);
gdk_draw_line (window, gc2, gdk_draw_line (window, gc2,
@ -2647,10 +2647,8 @@ gtk_default_draw_box_gap (GtkStyle *style,
gdk_draw_line (window, gc2, gdk_draw_line (window, gc2,
x + gap_x + gap_width - 1, y, x + gap_x + gap_width - 1, y); x + gap_x + gap_width - 1, y, x + gap_x + gap_width - 1, y);
} }
} break;
else if (gap_side == 1) case GTK_POS_BOTTOM:
/* bottom */
{
gdk_draw_line (window, gc1, gdk_draw_line (window, gc1,
x, y, x + width - 1, y); x, y, x + width - 1, y);
gdk_draw_line (window, gc1, gdk_draw_line (window, gc1,
@ -2682,10 +2680,8 @@ gtk_default_draw_box_gap (GtkStyle *style,
gdk_draw_line (window, gc3, gdk_draw_line (window, gc3,
x + gap_x + gap_width - 1, y + height - 1, x + gap_x + gap_width - 1, y + height - 1); x + gap_x + gap_width - 1, y + height - 1, x + gap_x + gap_width - 1, y + height - 1);
} }
} break;
else if (gap_side == 2) case GTK_POS_LEFT:
/* left */
{
gdk_draw_line (window, gc1, gdk_draw_line (window, gc1,
x, y, x + width - 1, y); x, y, x + width - 1, y);
gdk_draw_line (window, gc2, gdk_draw_line (window, gc2,
@ -2717,10 +2713,8 @@ gtk_default_draw_box_gap (GtkStyle *style,
gdk_draw_line (window, gc2, gdk_draw_line (window, gc2,
x, y + gap_x + gap_width - 1, x, y + gap_x + gap_width - 1); x, y + gap_x + gap_width - 1, x, y + gap_x + gap_width - 1);
} }
} break;
else if (gap_side == 3) case GTK_POS_RIGHT:
/* right */
{
gdk_draw_line (window, gc1, gdk_draw_line (window, gc1,
x, y, x + width - 1, y); x, y, x + width - 1, y);
gdk_draw_line (window, gc1, gdk_draw_line (window, gc1,
@ -2752,6 +2746,7 @@ gtk_default_draw_box_gap (GtkStyle *style,
gdk_draw_line (window, gc3, gdk_draw_line (window, gc3,
x + width - 1, y + gap_x + gap_width - 1, x + width - 1, y + gap_x + gap_width - 1); x + width - 1, y + gap_x + gap_width - 1, x + width - 1, y + gap_x + gap_width - 1);
} }
break;
} }
} }
if (area) if (area)