Attachment #268915 for bug #325927





static void _sc_active_console_enter_spot(ScActiveConsole *cons, gboolean forceenter) {

   if(!forceenter && !gtk_widget_has_focus(GTK_WIDGET(cons))) {
      return;
   }
   if(cons->current != NULL) {


static void _sc_active_console_leave_spot(ScActiveConsole *cons, gboolean forceleave) {

   if(!forceleave && !gtk_widget_has_focus(GTK_WIDGET(cons))) {
      return;
   }
   if(cons->current != NULL) {

   cons->spots = NULL;
   cons->current = NULL;

   gtk_widget_set_can_default(GTK_WIDGET(cons), TRUE);
   gtk_widget_set_events(GTK_WIDGET(cons), GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);

}




   sc_gadget_get_extents(gadget, &bounds);

   /* Find out if this gadget has the focus right now. */
   focus = (gtk_widget_has_focus(gadget->console) &&
            (gadget->console->current->data == gadget->spot))
           ? TRUE : FALSE;

   /* Find out if the gadget will be sensitive. */
   sensitive = gtk_widget_is_sensitive(GTK_WIDGET(gadget->console));

   /* Setup the GC colors for the toggle (drawing outer). */
   if(!sensitive)

Lines 31-37 Link Here

(-)sgtk/swidgets/sdisplay.c.old (-1 / +1 lines)
31		31
32	assert(IS_SC_DISPLAY(dpy));	32	assert(IS_SC_DISPLAY(dpy));
33	dpy->draw = NULL;	33	dpy->draw = NULL;
34	GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(dpy), GTK_CAN_FOCUS);	34	gtk_widget_set_can_focus(GTK_WIDGET(dpy), FALSE);
35		35
36	}	36	}
37		37

Lines 116-122 Link Here

(-)sgtk/swidgets/sdrawbuf.c.old (-2 / +2 lines)
116	static gint _sc_drawbuf_expose(GtkWidget widget, GdkEventExpose event) {	116	static gint _sc_drawbuf_expose(GtkWidget widget, GdkEventExpose event) {
117		117
118	ScDrawbuf *draw = SC_DRAWBUF(widget);	118	ScDrawbuf *draw = SC_DRAWBUF(widget);
119	GdkGC fg_gc = widget->style->fg_gc[GTK_WIDGET_STATE((GtkWidget )draw)];	119	GdkGC fg_gc = widget->style->fg_gc[gtk_widget_get_state((GtkWidget )draw)];
120		120
121	/* Make sure buffer is allocated */	121	/* Make sure buffer is allocated */
122	g_return_val_if_fail(sc_drawbuf_get_buffer(draw) != NULL, TRUE);	122	g_return_val_if_fail(sc_drawbuf_get_buffer(draw) != NULL, TRUE);
Lines 156-162 Link Here
156	draw->style_configured = FALSE;	156	draw->style_configured = FALSE;
157		157
158	/* Setup widget, and object signals */	158	/* Setup widget, and object signals */
159	GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(draw), GTK_CAN_FOCUS);	159	gtk_widget_set_can_focus(GTK_WIDGET(draw), FALSE);
160	gtk_widget_add_events(GTK_WIDGET(draw), GDK_EXPOSURE_MASK);	160	gtk_widget_add_events(GTK_WIDGET(draw), GDK_EXPOSURE_MASK);
161	gtk_widget_set_app_paintable(GTK_WIDGET(draw), TRUE);	161	gtk_widget_set_app_paintable(GTK_WIDGET(draw), TRUE);
162		162

Return to bug 325927

Lines 408-414 Link Here

(-)sgtk/swidgets/sactiveconsole.c.old (-3 / +3 lines)
408		408
409	static void _sc_active_console_enter_spot(ScActiveConsole *cons, gboolean forceenter) {	409	static void _sc_active_console_enter_spot(ScActiveConsole *cons, gboolean forceenter) {
410		410
411	if(!forceenter && !GTK_WIDGET_HAS_FOCUS(GTK_WIDGET(cons))) {	411	if(!forceenter && !gtk_widget_has_focus(GTK_WIDGET(cons))) {
412	return;	412	return;
413	}	413	}
414	if(cons->current != NULL) {	414	if(cons->current != NULL) {
Lines 421-427 Link Here
421		421
422	static void _sc_active_console_leave_spot(ScActiveConsole *cons, gboolean forceleave) {	422	static void _sc_active_console_leave_spot(ScActiveConsole *cons, gboolean forceleave) {
423		423
424	if(!forceleave && !GTK_WIDGET_HAS_FOCUS(GTK_WIDGET(cons))) {	424	if(!forceleave && !gtk_widget_has_focus(GTK_WIDGET(cons))) {
425	return;	425	return;
426	}	426	}
427	if(cons->current != NULL) {	427	if(cons->current != NULL) {
Lines 1282-1288 Link Here
1282	cons->spots = NULL;	1282	cons->spots = NULL;
1283	cons->current = NULL;	1283	cons->current = NULL;
1284		1284
1285	GTK_WIDGET_SET_FLAGS(GTK_WIDGET(cons), GTK_CAN_DEFAULT);	1285	gtk_widget_set_can_default(GTK_WIDGET(cons), TRUE);
1286	gtk_widget_set_events(GTK_WIDGET(cons), GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK);	1286	gtk_widget_set_events(GTK_WIDGET(cons), GDK_BUTTON_PRESS_MASK \| GDK_BUTTON_RELEASE_MASK);
1287		1287
1288	}	1288	}

Lines 69-80 Link Here

(-)sgtk/swidgets/sactoggle.c.old (-2 / +2 lines)
69	sc_gadget_get_extents(gadget, &bounds);	69	sc_gadget_get_extents(gadget, &bounds);
70		70
71	/* Find out if this gadget has the focus right now. */	71	/* Find out if this gadget has the focus right now. */
72	focus = (GTK_WIDGET_HAS_FOCUS(gadget->console) &&	72	focus = (gtk_widget_has_focus(gadget->console) &&
73	(gadget->console->current->data == gadget->spot))	73	(gadget->console->current->data == gadget->spot))
74	? TRUE : FALSE;	74	? TRUE : FALSE;
75		75
76	/* Find out if the gadget will be sensitive. */	76	/* Find out if the gadget will be sensitive. */
77	sensitive = GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(gadget->console));	77	sensitive = gtk_widget_is_sensitive(GTK_WIDGET(gadget->console));
78		78
79	/* Setup the GC colors for the toggle (drawing outer). */	79	/* Setup the GC colors for the toggle (drawing outer). */
80	if(!sensitive)	80	if(!sensitive)