1
1
Этот коммит содержится в:
Paul Sheer 1998-09-14 23:01:09 +00:00
родитель f36e99f150
Коммит b08c1f913b
3 изменённых файлов: 6 добавлений и 7 удалений

Просмотреть файл

@ -610,7 +610,7 @@ void edit_convert_expose_to_area (XExposeEvent * xexpose, int *row1, int *col1,
void edit_render_tidbits (GtkEdit * edit) void edit_render_tidbits (GtkEdit * edit)
{ {
return; gtk_widget_draw_focus (GTK_WIDGET (edit));
} }
#else #else

Просмотреть файл

@ -290,8 +290,8 @@ static void gtk_edit_style_set (GtkWidget * widget,
edit = GTK_EDIT (widget); edit = GTK_EDIT (widget);
if (GTK_WIDGET_REALIZED (widget)) { if (GTK_WIDGET_REALIZED (widget)) {
gdk_window_set_background (widget->window, &widget->style->base[GTK_STATE_NORMAL]); gdk_window_set_background (widget->window, &edit->color[1]);
gdk_window_set_background (edit->text_area, &widget->style->base[GTK_STATE_NORMAL]); gdk_window_set_background (edit->text_area, &edit->color[1]);
#if 0 #if 0
if ((widget->allocation.width > 1) || (widget->allocation.height > 1)) if ((widget->allocation.width > 1) || (widget->allocation.height > 1))
@ -453,7 +453,6 @@ static void gtk_edit_draw (GtkWidget * widget,
edit = GTK_EDIT (widget); edit = GTK_EDIT (widget);
edit_render_expose (edit->editor, &xexpose); edit_render_expose (edit->editor, &xexpose);
edit_status (edit->editor); edit_status (edit->editor);
gtk_widget_draw_focus (widget);
} }
} }
@ -496,7 +495,6 @@ static gint
gtk_edit_set_colors (edit); gtk_edit_set_colors (edit);
edit_render_expose (edit->editor, &xexpose); edit_render_expose (edit->editor, &xexpose);
edit_status (edit->editor); edit_status (edit->editor);
gtk_widget_draw_focus (widget);
} }
return FALSE; return FALSE;
} }
@ -920,6 +918,7 @@ void gtk_edit_alloc_colors (GtkEdit *edit, GdkColormap *colormap)
if (!gdk_color_alloc (colormap, &edit->color[i])) if (!gdk_color_alloc (colormap, &edit->color[i]))
g_warning ("cannot allocate color"); g_warning ("cannot allocate color");
} }
edit->color_last_pixel = 27;
} }
int allocate_color (WEdit *edit, gchar *color) int allocate_color (WEdit *edit, gchar *color)

Просмотреть файл

@ -37,10 +37,10 @@ extern unsigned char per_char[256];
/* background colors: marked is refers to mouse highlighting, highlighted refers to a found string. */ /* background colors: marked is refers to mouse highlighting, highlighted refers to a found string. */
extern unsigned long edit_abnormal_color, edit_marked_abnormal_color; extern unsigned long edit_abnormal_color, edit_marked_abnormal_color;
extern unsigned long edit_highlighted_color, edit_marked_color; extern unsigned long edit_highlighted_color, edit_marked_color;
extern unsigned long edit_normal_background_color; extern unsigned long edit_normal_background_color = 0;
/* foreground colors */ /* foreground colors */
extern unsigned long edit_normal_foreground_color, edit_bold_color; extern unsigned long edit_normal_foreground_color = 0, edit_bold_color;
extern unsigned long edit_italic_color; extern unsigned long edit_italic_color;
/* cursor color */ /* cursor color */