X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fctsim.h;h=abc16fd173e41c7473195dab2232809421e8b599;hb=52f2fdc3424cd6b5b77ad1497243e1e06739ffe6;hp=a4049f17a94cd0bdc12dd7b1711811718961093b;hpb=e081109a4a541c8780aaa253b874acada5957200;p=ctsim.git

diff --git a/src/ctsim.h b/src/ctsim.h
index a4049f1..abc16fd 100644
--- a/src/ctsim.h
+++ b/src/ctsim.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: ctsim.h,v 1.52 2001/02/22 15:00:20 kevin Exp $
+**  $Id: ctsim.h,v 1.54 2001/03/02 21:11:50 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -35,6 +35,12 @@
 #include <dmalloc.h>
 #endif
 
+#ifdef MSVC
+#define HAVE_WXTHREADS 1
+#else
+#undef HAVE_WXTHREADS
+#endif
+
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
@@ -101,6 +107,7 @@ private:
   wxMenuItem* m_apWindowMenuItems[MAX_WINDOW_MENUITEMS];
   wxDocument* m_apWindowMenuData[MAX_WINDOW_MENUITEMS];
   
+  int m_iDefaultImportFormat;
   int m_iDefaultPhantomID;
   int m_iDefaultFilterID;
   int m_iDefaultFilterDomainID;
@@ -144,6 +151,7 @@ public:
   void OnLogEvent (wxCommandEvent& event);  // used by thread children
 
   void OnHelpButton (wxCommandEvent& event);
+  void OnImport (wxCommandEvent& event);
 
 #if defined(CTSIM_WINHELP) && (defined(DEBUG) || defined(_DEBUG))
   void OnHelpSecondary (wxCommandEvent& event);
@@ -292,7 +300,8 @@ enum {
     MAINMENU_FILE_EXIT,
     MAINMENU_FILE_PREFERENCES,
     MAINMENU_LOG_EVENT,
-        
+    MAINMENU_IMPORT,
+    
     PJMENU_FILE_PROPERTIES,
     PJMENU_RECONSTRUCT_FBP,
     PJMENU_RECONSTRUCT_FOURIER,