[Dda-cvs] ntdda/src/win32gui winmain.c,1.40,1.41

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/src/win32gui
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9891/win32gui

Modified Files:
	winmain.c 
Log Message:
Moved dxf code to it's own file.  This file can 
later form the basis for an entire dxf module.

Index: winmain.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/win32gui/winmain.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** winmain.c	7 Jun 2006 15:50:30 -0000	1.40
--- winmain.c	1 Jul 2006 05:25:26 -0000	1.41
***************
*** 29,33 ****
  #include <htmlhelp.h>
  #include <tchar.h>
! #include "math.h"
  
  
--- 29,33 ----
  #include <htmlhelp.h>
  #include <tchar.h>
! #include <math.h>
  
  
***************
*** 39,43 ****
  #include "toolbar.h"
  #include "statusbar.h"
! #include "runstates.h"
  
  
--- 39,44 ----
  #include "toolbar.h"
  #include "statusbar.h"
! #include "runstates.h"
! #include "dxf.h"
  
  
***************
*** 62,67 ****
  
  
! #define ABOUT "UC Berkeley DDA for Windows 95/NT(unstable),\n", \
!               "$Id$\n", \
  				  "by Mary M. MacLaughlin (Montana Tech), and Nicholas Sitar & David Doolin\n", \
                "Department of Civil Engineering, Geotechnical Group\n", \
--- 63,68 ----
  
  
! #define ABOUT "UC Berkeley DDA for Windows 95/NT,\n", \
!               "Limerick RC-1 (Version 1.5 rc1) \n", \
  				  "by Mary M. MacLaughlin (Montana Tech), and Nicholas Sitar & David Doolin\n", \
                "Department of Civil Engineering, Geotechnical Group\n", \
***************
*** 1709,1713 ****
  
  
! 
  void 
  readDXF(FILE * fp1) {
--- 1710,1714 ----
  
  
! #if 0
  void 
  readDXF(FILE * fp1) {
***************
*** 2014,2017 ****
--- 2015,2019 ----
  
  }
+ #endif
  
  
***************
*** 2062,2068 ****
  	  // and arcs will be recognized from dxf file
        fp1 = fopen(filepath.gfile,"r");
  
        // Pass everything in to readDXF.
!       readDXF(fp1);
        
     }
--- 2064,2071 ----
  	  // and arcs will be recognized from dxf file
        fp1 = fopen(filepath.gfile,"r");
+       strcpy (filepath.gfile, strcat (filepath.rootname, ".geo"));
  
        // Pass everything in to readDXF.
!       dxf_read_file(fp1,filepath.gfile);
        
     }