[htoolkit-cvs] port/src/cbits/GTK ColorDialog.c,1.3,1.4 FileDialog.c,1.6,1.7 FontDialog.c,1.4,1.5

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

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

Modified Files:
	ColorDialog.c FileDialog.c FontDialog.c 
Log Message:
bugfixes


Index: ColorDialog.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/ColorDialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ColorDialog.c	30 Mar 2003 18:42:41 -0000	1.3
--- ColorDialog.c	27 Apr 2003 17:51:40 -0000	1.4
***************
*** 1,22 ****
! #include "ColorDialog.h"
  #include "Internals.h"
! 
! BOOL osRunColorDialog(unsigned int *color)
! {
  	gint result;
! 	GdkColor c;
! 	GtkWidget *color_dialog;
! 
! 	color_dialog = gtk_color_selection_dialog_new("Color");
! 	gtk_window_set_transient_for(GTK_WINDOW(color_dialog), GTK_WINDOW(gFrameWidget));
! 
! 	result = gtk_dialog_run(GTK_DIALOG(color_dialog));
! 	gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(color_dialog)->colorsel), &c);
! 	gtk_widget_destroy (color_dialog);
! 
! 	if (result != GTK_RESPONSE_OK)
! 		return FALSE;
! 
! 	*color = (c.red/257) | (c.green/257 << 8) | (c.blue/257 << 16);
! 	return TRUE;
  }
--- 1,27 ----
! #include "CommonDialogs.h"
  #include "Internals.h"
! 
! BOOL osRunColorDialog(unsigned int *color, WindowHandle owner)
! {
  	gint result;
! 	GdkColor c;
! 	GtkWidget *color_dialog;
! 
! 	color_dialog = gtk_color_selection_dialog_new("Color");
! 	
! 	if (owner)
! 		owner = gtk_widget_get_toplevel(owner);
! 	else
! 		owner = gFrameWidget;
! 	gtk_window_set_transient_for(GTK_WINDOW(color_dialog), GTK_WINDOW(owner));
! 
! 	result = gtk_dialog_run(GTK_DIALOG(color_dialog));
! 	gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(color_dialog)->colorsel), &c);
! 	gtk_widget_destroy (color_dialog);
! 
! 	if (result != GTK_RESPONSE_OK)
! 		return FALSE;
! 
! 	*color = (c.red/257) | (c.green/257 << 8) | (c.blue/257 << 16);
! 	return TRUE;
  }

Index: FileDialog.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/FileDialog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FileDialog.c	26 Apr 2003 20:56:33 -0000	1.6
--- FileDialog.c	27 Apr 2003 17:51:40 -0000	1.7
***************
*** 1,3 ****
! #include "FileDialog.h"
  #include "Internals.h"
  
--- 1,3 ----
! #include "CommonDialogs.h"
  #include "Internals.h"
  

Index: FontDialog.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/GTK/FontDialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FontDialog.c	30 Mar 2003 18:42:41 -0000	1.4
--- FontDialog.c	27 Apr 2003 17:51:40 -0000	1.5
***************
*** 1,11 ****
! #include "FontDialog.h"
  #include "Internals.h"
  
! BOOL osRunFontDialog(char **fname, int *fsize, int *fweight, int *fstyle, BOOL *funderline, BOOL *fstrikeout)
  {
  	GtkWidget *font_dialog;
  
  	font_dialog = gtk_font_selection_dialog_new("Font");
! 	gtk_window_set_transient_for(GTK_WINDOW(font_dialog), GTK_WINDOW(gFrameWidget));
  
  	if (gtk_dialog_run(GTK_DIALOG(font_dialog)) == GTK_RESPONSE_OK)
--- 1,16 ----
! #include "CommonDialogs.h"
  #include "Internals.h"
  
! BOOL osRunFontDialog(char **fname, int *fsize, int *fweight, int *fstyle, BOOL *funderline, BOOL *fstrikeout, WindowHandle owner)
  {
  	GtkWidget *font_dialog;
  
  	font_dialog = gtk_font_selection_dialog_new("Font");
! 	
! 	if (owner)
! 		owner = gtk_widget_get_toplevel(owner);
! 	else
! 		owner = gFrameWidget;
! 	gtk_window_set_transient_for(GTK_WINDOW(font_dialog), GTK_WINDOW(owner));
  
  	if (gtk_dialog_run(GTK_DIALOG(font_dialog)) == GTK_RESPONSE_OK)