[htoolkit-cvs] port/src/cbits/GTK Frame.c,1.6,1.7

[<kr_...@us...>]

Update of /cvsroot/htoolkit/port/src/cbits/GTK
In directory sc8-pr-cvs1:/tmp/cvs-serv19641/src/cbits/GTK

Modified Files:
	Frame.c 
Log Message:
bugfix


Index: Frame.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/Frame.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Frame.c	23 Apr 2003 21:48:52 -0000	1.6
--- Frame.c	26 Apr 2003 21:39:20 -0000	1.7
***************
*** 13,17 ****
  {
  	GtkWidget *window = gtk_notebook_get_nth_page(GTK_NOTEBOOK(client),  gtk_notebook_get_current_page(GTK_NOTEBOOK(client)));
! 	handleWindowDismiss(window);
  }
  
--- 13,17 ----
  {
  	GtkWidget *window = gtk_notebook_get_nth_page(GTK_NOTEBOOK(client),  gtk_notebook_get_current_page(GTK_NOTEBOOK(client)));
! 	if (window) handleWindowDismiss(window);
  }
  
***************
*** 110,113 ****
--- 110,116 ----
  		widget = gtk_notebook_get_nth_page(GTK_NOTEBOOK(gClientWidget),  gtk_notebook_get_current_page(GTK_NOTEBOOK(gClientWidget)));
  
+ 	if (!widget)
+ 		return gtk_false();
+ 
  	if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  	if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
***************
*** 157,160 ****
--- 160,166 ----
  			widget = gtk_notebook_get_nth_page(GTK_NOTEBOOK(gClientWidget),  gtk_notebook_get_current_page(GTK_NOTEBOOK(gClientWidget)));
  
+ 		if (!widget)
+ 			return gtk_false();
+ 
  		if (event->state & GDK_SHIFT_MASK) modifiers |= shiftBIT;
  		if (event->state & GDK_CONTROL_MASK) modifiers |= ctrlBIT;
***************
*** 171,188 ****
  static void sdiframe_focus_in_handler(GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
  {
! 	handleWindowActivate(gClientWidget);
  }
  
  static void sdiframe_focus_out_handler(GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
  {
! 	if (gInKey)
  	{
! 		handleWindowKeyboard(gClientWidget, evKeyUp, gCurChar, 0);
  
! 		gInKey = FALSE;
! 		gCurChar = 0;
! 	}
  
! 	handleWindowDeactivate(gClientWidget);
  }
  
--- 177,198 ----
  static void sdiframe_focus_in_handler(GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
  {
! 	if (gClientWidget)
! 	  handleWindowActivate(gClientWidget);
  }
  
  static void sdiframe_focus_out_handler(GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
  {
! 	if (gClientWidget)
  	{
! 		if (gInKey)
! 		{
! 			handleWindowKeyboard(gClientWidget, evKeyUp, gCurChar, 0);
  
! 			gInKey = FALSE;
! 			gCurChar = 0;
! 		}
  
! 		handleWindowDeactivate(gClientWidget);
! 	}
  }