Index: src/base/PnlAnaBase.cpp
===================================================================
--- src/base/PnlAnaBase.cpp	(revision 93)
+++ src/base/PnlAnaBase.cpp	(working copy)
@@ -17,6 +17,10 @@
 //*****************************************************************************
 
 #include "base/PnlAnaBase.hpp"
+#define win // vik
+#ifdef win
+typedef unsigned int uint;
+#endif
 
 //*****************************************************************************
 // Constructor.
Index: src/main/DlgPrefs.cpp
===================================================================
--- src/main/DlgPrefs.cpp	(revision 93)
+++ src/main/DlgPrefs.cpp	(working copy)
@@ -17,6 +17,10 @@
 //*****************************************************************************
 
 #include "main/DlgPrefs.hpp"
+#define win // vik
+#ifdef win
+typedef unsigned int uint;
+#endif
 
 //*****************************************************************************
 // Implement an event table.
Index: src/main/FrmMain.cpp
===================================================================
--- src/main/FrmMain.cpp	(revision 93)
+++ src/main/FrmMain.cpp	(working copy)
@@ -20,7 +20,8 @@
 
 // The application icon
 #if defined( __WXGTK__ ) || defined( __WXMOTIF__ ) || defined( __WXMAC__ ) || \
-    defined( __WXMGL__ ) || defined( __WXX11__ )
+    defined( __WXMGL__ ) || defined( __WXX11__ ) || \
+    defined( __WXMSW__ ) // vik
   #include "icons/gspiceui-32x32.xpm"
   #include "icons/file-open.xpm"
   #include "icons/file-import.xpm"
Index: src/main/HelpTasks.cpp
===================================================================
--- src/main/HelpTasks.cpp	(revision 93)
+++ src/main/HelpTasks.cpp	(working copy)
@@ -20,13 +20,19 @@
 #include "main/FrmMain.hpp"
 
 // The application icon
+/* vik
 #if defined( __WXGTK__ ) || defined( __WXMOTIF__ ) || defined( __WXMAC__ ) || \
     defined( __WXMGL__ ) || defined( __WXX11__ )
     #include "icons/gspiceui-32x32.xpm"
     #include "icons/html-close.xpm"
     #include "icons/html-back.xpm"
 #endif
+*/ 
+    #include "icons/gspiceui-32x32.xpm"
+    #include "icons/html-close.xpm"
+    #include "icons/html-back.xpm"
 
+
 //*****************************************************************************
 // Implement an event table in which the events are routed to their respective
 // handler functions in the class. If -1 is given as the ID, the given handler
Index: src/Makefile.deps
===================================================================
--- src/Makefile.deps	(revision 93)
+++ src/Makefile.deps	(working copy)
@@ -28,7 +28,7 @@
   process/PrcGNetList.hpp base/PrcBase.hpp utility/TextCtrl.hpp \
   TypeDefs.hpp
 obj/TypeDefs.o: TypeDefs.cpp TypeDefs.hpp
-obj/NetList.o: bak/NetList.cpp netlist/NetList.hpp Version.hpp TypeDefs.hpp \
+obj/NetList.o: netlist/NetList.cpp netlist/NetList.hpp Version.hpp TypeDefs.hpp \
   utility/iStrCmp.h netlist/Component.hpp utility/ConvertType.hpp
 obj/CmdBase.o: base/CmdBase.cpp base/CmdBase.hpp TypeDefs.hpp
 obj/NbkSimrBase.o: base/NbkSimrBase.cpp base/NbkSimrBase.hpp TypeDefs.hpp \
Index: src/ngspice/panels/PnlNgSpiceAC.cpp
===================================================================
--- src/ngspice/panels/PnlNgSpiceAC.cpp	(revision 93)
+++ src/ngspice/panels/PnlNgSpiceAC.cpp	(working copy)
@@ -17,6 +17,10 @@
 //*****************************************************************************
 
 #include "ngspice/panels/PnlNgSpiceAC.hpp"
+#define win // vik
+#ifdef win
+typedef unsigned int uint;
+#endif 
 
 //*****************************************************************************
 // Implement an event table.
Index: src/process/PrcGaw.cpp
===================================================================
--- src/process/PrcGaw.cpp	(revision 93)
+++ src/process/PrcGaw.cpp	(working copy)
@@ -17,6 +17,7 @@
 //*****************************************************************************
 
 #include "process/PrcGaw.hpp"
+#define win
 
 //*****************************************************************************
 // Constructor.
@@ -28,7 +29,11 @@
   m_ofnLog    .Clear( );
 
   // Attempt to set and find the Gaw binary
+#ifndef win
   bSetBinary( wxT("gaw") );
+#else
+  bSetBinary( wxT("gaw.exe") );
+#endif
 }
 
 //*****************************************************************************
Index: src/process/PrcGnuCap.cpp
===================================================================
--- src/process/PrcGnuCap.cpp	(revision 93)
+++ src/process/PrcGnuCap.cpp	(working copy)
@@ -17,6 +17,7 @@
 //*****************************************************************************
 
 #include "process/PrcGnuCap.hpp"
+#define win // vik
 
 //*****************************************************************************
 // Constructor.
@@ -27,7 +28,12 @@
   m_eSimEng = eSIMR_GNUCAP;
 
   // Set the simulator binary file name if it can be found
+
+#ifndef win
   bSetBinary( wxT("gnucap") );
+#else
+  bSetBinary( wxT("gnucap.exe") );
+#endif
 
   m_osInput.Empty( );
 }
Index: src/process/PrcGSchem.cpp
===================================================================
--- src/process/PrcGSchem.cpp	(revision 93)
+++ src/process/PrcGSchem.cpp	(working copy)
@@ -17,6 +17,7 @@
 //*****************************************************************************
 
 #include "process/PrcGSchem.hpp"
+#define win
 
 //*****************************************************************************
 // Constructor.
@@ -28,7 +29,11 @@
   m_ofnLog    .Clear( );
 
   // Attempt to set and find the appropriate binary
-  bSetBinary( wxT("gschem") );
+#ifndef win
+  bSetBinary( wxT("eeschema") );
+#else
+  bSetBinary( wxT("eeschema.exe") );
+#endif
 }
 
 //*****************************************************************************
Index: src/process/PrcGWave.cpp
===================================================================
--- src/process/PrcGWave.cpp	(revision 93)
+++ src/process/PrcGWave.cpp	(working copy)
@@ -17,6 +17,7 @@
 //*****************************************************************************
 
 #include "process/PrcGWave.hpp"
+#define win
 
 //*****************************************************************************
 // Constructor.
@@ -28,7 +29,11 @@
   m_ofnLog    .Clear( );
 
   // Attempt to set and find the gWave binary
+#ifndef win
   bSetBinary( wxT("gwave") );
+#else
+  bSetBinary( wxT("gwave.exe") );
+#endif
 }
 
 //*****************************************************************************
Index: src/process/PrcNgSpice.cpp
===================================================================
--- src/process/PrcNgSpice.cpp	(revision 93)
+++ src/process/PrcNgSpice.cpp	(working copy)
@@ -17,6 +17,7 @@
 //*****************************************************************************
 
 #include "process/PrcNgSpice.hpp"
+#define win
 
 //*****************************************************************************
 // Constructor.
@@ -27,7 +28,11 @@
   m_eSimEng = eSIMR_NGSPICE;
 
   // Set the simulator binary file name if it can be found
+#ifndef win
   bSetBinary( wxT("ngspice") );
+#else
+  bSetBinary( wxT("ngspice.exe") );
+#endif
 }
 
 //*****************************************************************************
Index: src/utility/ChoUnits.cpp
===================================================================
--- src/utility/ChoUnits.cpp	(revision 93)
+++ src/utility/ChoUnits.cpp	(working copy)
@@ -17,7 +17,10 @@
 //*****************************************************************************
 
 #include "utility/ChoUnits.hpp"
-
+#define win // vik
+#ifdef win
+typedef unsigned int uint;
+#endif 
 //*****************************************************************************
 // Constructor.
 
Index: src/utility/ConvertType.cpp
===================================================================
--- src/utility/ConvertType.cpp	(revision 93)
+++ src/utility/ConvertType.cpp	(working copy)
@@ -17,6 +17,7 @@
 //*****************************************************************************
 
 #include "utility/ConvertType.hpp"
+#define win
 
 //*****************************************************************************
 // Allocate storage for static data members.
@@ -249,6 +250,7 @@
 //   Failure - An empty string
 
 bool  ConvertType::bDFltToStrEng( double dfNum, wxString & rosNum )
+#ifndef win
 {
   wxString  osFmt;
   float     fMan;  // Mantissa
@@ -294,7 +296,61 @@
 
   return( i1<0 ? FALSE : TRUE );
 }
+#else
+{
+  wxString  osUnits;
+  float     fMan;  // Mantissa
+  int       iExp;  // Exponent
 
+  rosNum .Empty( );
+  osUnits.Empty( );
+
+  if( ! bParseFlt( dfNum, &fMan, &iExp ) ) return( FALSE );
+
+  switch( iExp )
+  {
+    case  14: osUnits = wxT("Tera"); fMan *= 100.0; break;
+    case  13: osUnits = wxT("Tera"); fMan *=  10.0; break;
+    case  12: osUnits = wxT("Tera");                break;
+    case  11: osUnits = wxT("Giga"); fMan *= 100.0; break;
+    case  10: osUnits = wxT("Giga"); fMan *=  10.0; break;
+    case   9: osUnits = wxT("Giga");                break;
+    case   8: osUnits = wxT("Meg");  fMan *= 100.0; break;
+    case   7: osUnits = wxT("Meg");  fMan *=  10.0; break;
+    case   6: osUnits = wxT("Meg");                 break;
+    case   5: osUnits = wxT("K");    fMan *= 100.0; break;
+    case   4: osUnits = wxT("K");    fMan *=  10.0; break;
+    case   3: osUnits = wxT("K");                   break;
+    case   2:                        fMan *= 100.0; break;
+    case   1:                        fMan *=  10.0; break;
+    case   0:                                       break;
+    case  -1: osUnits = wxT("m");    fMan *= 100.0; break;
+    case  -2: osUnits = wxT("m");    fMan *=  10.0; break;
+    case  -3: osUnits = wxT("m");                   break;
+    case  -4: osUnits = wxT("u");    fMan *= 100.0; break;
+    case  -5: osUnits = wxT("u");    fMan *=  10.0; break;
+    case  -6: osUnits = wxT("u");                   break;
+    case  -7: osUnits = wxT("n");    fMan *= 100.0; break;
+    case  -8: osUnits = wxT("n");    fMan *=  10.0; break;
+    case  -9: osUnits = wxT("n");                   break;
+    case -10: osUnits = wxT("p");    fMan *= 100.0; break;
+    case -11: osUnits = wxT("p");    fMan *=  10.0; break;
+    case -12: osUnits = wxT("p");                   break;
+    case -13: osUnits = wxT("f");    fMan *= 100.0; break;
+    case -14: osUnits = wxT("f");    fMan *=  10.0; break;
+    case -15: osUnits = wxT("f");                   break;
+    default:                               return( FALSE );
+  }
+
+  // Probably need to round fMantissa here instead of truncating it ??? 07/10/2004
+
+  if( rosNum.Printf( wxT("%#.2f%s"), fMan, osUnits.c_str( ) ) < 0 )
+    return( FALSE );
+
+  return( TRUE );
+}
+
+#endif
 //*****************************************************************************
 // Parse a double float value into it's mantissa and exponent.
 //
Index: src/utility/iStrCmp.c
===================================================================
--- src/utility/iStrCmp.c	(revision 93)
+++ src/utility/iStrCmp.c	(working copy)
@@ -17,7 +17,10 @@
 //*****************************************************************************
 
 #include "utility/iStrCmp.h"
-
+#define win // vik
+#ifdef win
+typedef unsigned long ulong;
+#endif 
 //*****************************************************************************
 // Compare algorithm for sorting strings alpha/numerically.
 //