Some restructring: added crossbasetypes.hpp

src/crossbasetypes.hpp

@@ -0,0 +1,24 @@
+#ifndef CROSSBASETYPES_HPP
+#define CROSSBASETYPES_HPP
+
+#include <set>
+#include <vector>
+#include <cstdint>
+
+typedef std::map<wxString,wxString> DictType;
+typedef std::vector< std::vector<wxChar> > GridType;
+typedef std::vector< std::vector<wxChar> > CurGridType;
+// Fisrt index is a word length
+typedef std::vector< std::vector<wxString> > AllWordsType; 
+typedef std::set< uint32_t > UsedWords;
+
+struct WordInfo {
+    size_t x;
+    size_t y;
+    size_t len;
+    size_t ind;
+    //true for vertical and false for horisontal
+    bool direct;
+};
+
+#endif // CROSSBASETYPES_HPP

src/crossgen.hpp

@@ -6,21 +6,7 @@
 
 #include <wx/wx.h>
 
-typedef std::map<wxString,wxString> DictType;
+#include "crossbasetypes.hpp"
-typedef std::vector< std::vector<wxChar> > GridType;
-typedef std::vector< std::vector<wxChar> > CurGridType;
-// Fisrt index is a word length
-typedef std::vector< std::vector<wxString> > AllWordsType; 
-typedef std::set< uint32_t > UsedWords;
-
-struct WordInfo {
-    size_t x;
-    size_t y;
-    size_t len;
-    size_t ind;
-    //true for vertical and false for horisontal
-    bool direct;
-};
 
 const wxChar CELL_CLEAR = wxT('+');
 

wxCrossGen/wxCrossGen.project

@@ -31,6 +31,7 @@
   </VirtualDirectory>
   <VirtualDirectory Name="Shared">
     <File Name="../src/crossgen.hpp"/>
+    <File Name="../src/crossbasetypes.hpp"/>
   </VirtualDirectory>
   <Settings Type="Executable">
     <GlobalSettings>