[Xtrkcad-fork-commits] xtrkcad/app/wlib/gtklib ChangeLog, 1.34, 1.35 gtkint.h, 1.3, 1.4 gtkmisc.c, 1.12, 1.13 gtkwindow.c, 1.9, 1.10 wpref.c, 1.11, 1.12

[Martin F. <m_f...@us...>]

Update of /cvsroot/xtrkcad-fork/xtrkcad/app/wlib/gtklib
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8225/app/wlib/gtklib

Modified Files:
	ChangeLog gtkint.h gtkmisc.c gtkwindow.c wpref.c 
Log Message:
Add option to select configuration 

Index: gtkmisc.c
===================================================================
RCS file: /cvsroot/xtrkcad-fork/xtrkcad/app/wlib/gtklib/gtkmisc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gtkmisc.c	31 May 2009 13:13:40 -0000	1.12
--- gtkmisc.c	24 Jul 2009 15:58:24 -0000	1.13
***************
*** 42,45 ****
--- 42,46 ----
  
  char wAppName[256];
+ char wConfigName[ 256 ];
  
  #define FOUR		(4)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/xtrkcad-fork/xtrkcad/app/wlib/gtklib/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** ChangeLog	9 Jun 2009 19:20:31 -0000	1.34
--- ChangeLog	24 Jul 2009 15:58:24 -0000	1.35
***************
*** 1,2 ****
--- 1,11 ----
+ Jun 24, 2009
+ 	ENH: Martin Fischer <m_f...@us...>
+ 		gtkwindow.c gtkmisc.c gtkint.h wpref.c: add option
+ 		to select configuration file
+ 
+ Version 4.0.3a
+ ==============
+ 
+ 
  Jun 09, 2009
  	FIX: Martin Fischer <m_f...@us...>

Index: gtkwindow.c
===================================================================
RCS file: /cvsroot/xtrkcad-fork/xtrkcad/app/wlib/gtklib/gtkwindow.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gtkwindow.c	12 Jul 2008 10:52:03 -0000	1.9
--- gtkwindow.c	24 Jul 2009 15:58:24 -0000	1.10
***************
*** 820,823 ****
--- 820,838 ----
  }
  
+ /**
+  * Initialize the application's main window. This function does the necessary initialization 
+  * of the application including creation of the main window.
+  *
+  * \param name IN internal name of the application. Used for filenames etc. 
+  * \param x    IN Initial window width
+  * \param y    IN Initial window height
+  * \param helpStr IN Help topic string
+  * \param labelStr IN window title
+  * \param nameStr IN Window name
+  * \param option IN options for window creation
+  * \param winProc IN pointer to main window procedure
+  * \param data IN User context
+  * \return    window handle or NULL on error
+  */
  
  EXPORT wWin_p wWinMainCreate(
***************
*** 837,841 ****
  */
  {
! 	strncpy( wAppName, name, sizeof wAppName );
  	gtkMainW = wWinCommonCreate( NULL, W_MAIN, x, y, labelStr, nameStr, option, winProc, data );
  
--- 852,868 ----
  */
  {
! 	char *pos;
! 
! 	if( pos = strchr( name, ';' )) {
! 		/* if found, split application name and configuration name */
! 		strncpy( wAppName, name, pos - name );
! 		wAppName[ pos - name ] = '\0';
! 		strcpy( wConfigName, pos + 1 );
! 	} else {
! 		/* if not found, application name and configuration name are same */
! 		strcpy( wAppName, name );
! 		strcpy( wConfigName, name );
! 	}
! 
  	gtkMainW = wWinCommonCreate( NULL, W_MAIN, x, y, labelStr, nameStr, option, winProc, data );
  

Index: wpref.c
===================================================================
RCS file: /cvsroot/xtrkcad-fork/xtrkcad/app/wlib/gtklib/wpref.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wpref.c	15 May 2009 18:54:20 -0000	1.11
--- wpref.c	24 Jul 2009 15:58:24 -0000	1.12
***************
*** 43,46 ****
--- 43,47 ----
  
  extern char wAppName[];
+ extern char wConfigName[];
  static char appLibDir[BUFSIZ];
  static char appWorkDir[BUFSIZ];
***************
*** 210,214 ****
  	prefInitted = TRUE;
  	workDir = wGetAppWorkDir();
! 	sprintf( tmp, "%s/%s.rc", workDir, wAppName );
  	prefFile = fopen( tmp, "r" );
  	if (prefFile == NULL)
--- 211,215 ----
  	prefInitted = TRUE;
  	workDir = wGetAppWorkDir();
! 	sprintf( tmp, "%s/%s.rc", workDir, wConfigName );
  	prefFile = fopen( tmp, "r" );
  	if (prefFile == NULL)
***************
*** 428,431 ****
--- 429,437 ----
  }
  
+ /**
+  * Save the configuration to a file. The config parameters are held and updated in an array.
+  * To make the settings persistant, this function has to be called. 
+  *
+  */
  
  EXPORT void wPrefFlush(
***************
*** 443,447 ****
  	
  	workDir = wGetAppWorkDir();
! 	sprintf( tmp, "%s/%s.rc", workDir, wAppName );
  	prefFile = fopen( tmp, "w" );
  	if (prefFile == NULL)
--- 449,453 ----
  	
  	workDir = wGetAppWorkDir();
! 	sprintf( tmp, "%s/%s.rc", workDir, wConfigName );
  	prefFile = fopen( tmp, "w" );
  	if (prefFile == NULL)

Index: gtkint.h
===================================================================
RCS file: /cvsroot/xtrkcad-fork/xtrkcad/app/wlib/gtklib/gtkint.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gtkint.h	1 Feb 2008 19:34:27 -0000	1.3
--- gtkint.h	24 Jul 2009 15:58:24 -0000	1.4
***************
*** 103,107 ****
  		};
  
! extern char wAppName[256];
  extern int gtkIgnoreEvents;
  extern int gtkColorDepth;
--- 103,108 ----
  		};
  
! extern char wAppName[];
! extern char wConfigName[];
  extern int gtkIgnoreEvents;
  extern int gtkColorDepth;