[htoolkit-cvs] port/src/cbits/Win32 ColorDialog.c,1.2,1.3 FileDialog.c,1.4,1.5 FontDialog.c,1.2,1.3

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

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

Modified Files:
	ColorDialog.c FileDialog.c FontDialog.c 
Log Message:
Add owner window as parameter for each function in CommonDialog


Index: ColorDialog.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/ColorDialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ColorDialog.c	29 Mar 2003 08:12:18 -0000	1.2
--- ColorDialog.c	26 Apr 2003 20:56:34 -0000	1.3
***************
*** 5,14 ****
  {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
  
! BOOL osRunColorDialog(unsigned int *color)
  {
  	CHOOSECOLOR cc;
  
  	cc.lStructSize = sizeof(cc);
! 	cc.hwndOwner = ghWndFrame;
  	cc.hInstance = NULL;
  	cc.rgbResult = 0;
--- 5,14 ----
  {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
  
! BOOL osRunColorDialog(unsigned int *color, WindowHandle owner)
  {
  	CHOOSECOLOR cc;
  
  	cc.lStructSize = sizeof(cc);
! 	cc.hwndOwner = owner ? owner : ghWndFrame;
  	cc.hInstance = NULL;
  	cc.rgbResult = 0;

Index: FileDialog.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/FileDialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileDialog.c	26 Apr 2003 10:00:48 -0000	1.4
--- FileDialog.c	26 Apr 2003 20:56:34 -0000	1.5
***************
*** 18,22 ****
  }
  
! char *osSelectDirectory(char *title)
  {
  	char buffer[MAX_PATH];
--- 18,22 ----
  }
  
! char *osSelectDirectory(char *title, WindowHandle owner)
  {
  	char buffer[MAX_PATH];
***************
*** 25,29 ****
  	char *s = NULL;	
  
! 	bi.hwndOwner      = ghWndFrame;
  	bi.pidlRoot       = NULL;
  	bi.pszDisplayName = buffer;
--- 25,29 ----
  	char *s = NULL;	
  
! 	bi.hwndOwner      = owner ? owner : ghWndFrame;
  	bi.pidlRoot       = NULL;
  	bi.pszDisplayName = buffer;
***************
*** 47,57 ****
  }
  
! char *osSelectInputFile(char *title, char *filter)
  {
  	OPENFILENAME ofn;
  
  	ofn.lStructSize       = sizeof (OPENFILENAME);
! 
! 	ofn.hwndOwner         = ghWndFrame;
  	ofn.hInstance         = NULL;
  	ofn.lpstrFilter       = filter;
--- 47,56 ----
  }
  
! char *osSelectInputFile(char *title, char *filter, WindowHandle owner)
  {
  	OPENFILENAME ofn;
  
  	ofn.lStructSize       = sizeof (OPENFILENAME);
! 	ofn.hwndOwner         = owner ? owner : ghWndFrame;
  	ofn.hInstance         = NULL;
  	ofn.lpstrFilter       = filter;
***************
*** 83,87 ****
  }
  
! char *osSelectInputFiles(char *title, char *filter)
  {
  	char *buffer;
--- 82,86 ----
  }
  
! char *osSelectInputFiles(char *title, char *filter, WindowHandle owner)
  {
  	char *buffer;
***************
*** 93,97 ****
  
  	ofn.lStructSize       = sizeof (OPENFILENAME);
! 	ofn.hwndOwner         = ghWndFrame;
  	ofn.hInstance         = NULL;
  	ofn.lpstrFilter       = filter;
--- 92,96 ----
  
  	ofn.lStructSize       = sizeof (OPENFILENAME);
! 	ofn.hwndOwner         = owner ? owner : ghWndFrame;
  	ofn.hInstance         = NULL;
  	ofn.lpstrFilter       = filter;
***************
*** 159,163 ****
  }
  
! char *osSelectOutputFile(char *title, char *filter, char *nameptr)
  {
  	OPENFILENAME ofn;
--- 158,162 ----
  }
  
! char *osSelectOutputFile(char *title, char *filter, char *nameptr, WindowHandle owner)
  {
  	OPENFILENAME ofn;
***************
*** 167,171 ****
  
  	ofn.lStructSize       = sizeof (OPENFILENAME);
! 	ofn.hwndOwner         = ghWndFrame;
  	ofn.lpstrFilter       = filter;
  	ofn.lpstrCustomFilter = NULL;
--- 166,170 ----
  
  	ofn.lStructSize       = sizeof (OPENFILENAME);
! 	ofn.hwndOwner         = owner ? owner : ghWndFrame;
  	ofn.lpstrFilter       = filter;
  	ofn.lpstrCustomFilter = NULL;

Index: FontDialog.c
===================================================================
RCS file: /cvsroot/htoolkit/port/src/cbits/Win32/FontDialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FontDialog.c	29 Mar 2003 08:12:18 -0000	1.2
--- FontDialog.c	26 Apr 2003 20:56:34 -0000	1.3
***************
*** 2,6 ****
  #include "Internals.h"
  
! BOOL osRunFontDialog(char **fname, int *fsize, int *fweight, int *fstyle, BOOL *funderline, BOOL *fstrikeout)
  {
  	CHOOSEFONT cf;
--- 2,6 ----
  #include "Internals.h"
  
! BOOL osRunFontDialog(char **fname, int *fsize, int *fweight, int *fstyle, BOOL *funderline, BOOL *fstrikeout, WindowHandle owner)
  {
  	CHOOSEFONT cf;
***************
*** 8,12 ****
  
  	cf.lStructSize = sizeof(cf);
! 	cf.hwndOwner = ghWndFrame;
  	cf.hDC = NULL;
  	cf.lpLogFont = &lf;
--- 8,12 ----
  
  	cf.lStructSize = sizeof(cf);
! 	cf.hwndOwner = owner ? owner : ghWndFrame;
  	cf.hDC = NULL;
  	cf.lpLogFont = &lf;