Added GUI_App and MainFrame

1 files changed, 17 insertions, 16 deletions

diff --git a/src/slic3r/GUI/GUI.hpp b/src/slic3r/GUI/GUI.hpp
index 9b2fce5b4..878689bf3 100644
--- a/src/slic3r/GUI/GUI.hpp
+++ b/src/slic3r/GUI/GUI.hpp
@@ -71,23 +71,24 @@ namespace GUI {
 class Tab;
 class ConfigOptionsGroup;
 // Map from an file_type name to full file wildcard name.
-typedef std::map<std::string, std::string> t_file_wild_card;
-inline t_file_wild_card& get_file_wild_card() {
-	static t_file_wild_card FILE_WILDCARDS;
-	if (FILE_WILDCARDS.empty()){
-		FILE_WILDCARDS["known"]	= "Known files (*.stl, *.obj, *.amf, *.xml, *.prusa)|*.stl;*.STL;*.obj;*.OBJ;*.amf;*.AMF;*.xml;*.XML;*.prusa;*.PRUSA";
-		FILE_WILDCARDS["stl"]	= "STL files (*.stl)|*.stl;*.STL";
-		FILE_WILDCARDS["obj"]	= "OBJ files (*.obj)|*.obj;*.OBJ";
-        FILE_WILDCARDS["amf"]	= "AMF files (*.amf)|*.zip.amf;*.amf;*.AMF;*.xml;*.XML";
-        FILE_WILDCARDS["3mf"]	= "3MF files (*.3mf)|*.3mf;*.3MF;";
-        FILE_WILDCARDS["prusa"]	= "Prusa Control files (*.prusa)|*.prusa;*.PRUSA";
-		FILE_WILDCARDS["ini"]	= "INI files *.ini|*.ini;*.INI";
-		FILE_WILDCARDS["gcode"] = "G-code files (*.gcode, *.gco, *.g, *.ngc)|*.gcode;*.GCODE;*.gco;*.GCO;*.g;*.G;*.ngc;*.NGC";
-		FILE_WILDCARDS["svg"]	= "SVG files *.svg|*.svg;*.SVG";
-	}
-	return FILE_WILDCARDS;
-}
+const std::map<const std::string, const std::string> FILE_WILDCARDS{
+    std::make_pair("known", "Known files (*.stl, *.obj, *.amf, *.xml, *.prusa)|*.stl;*.STL;*.obj;*.OBJ;*.amf;*.AMF;*.xml;*.XML;*.prusa;*.PRUSA"),
+    std::make_pair("stl",   "STL files (*.stl)|*.stl;*.STL"),
+    std::make_pair("obj",   "OBJ files (*.obj)|*.obj;*.OBJ"),
+    std::make_pair("amf",   "AMF files (*.amf)|*.zip.amf;*.amf;*.AMF;*.xml;*.XML"),
+    std::make_pair("3mf",   "3MF files (*.3mf)|*.3mf;*.3MF;"),
+    std::make_pair("prusa", "Prusa Control files (*.prusa)|*.prusa;*.PRUSA"),
+    std::make_pair("ini",   "INI files *.ini|*.ini;*.INI"),
+    std::make_pair("gcode", "G-code files (*.gcode, *.gco, *.g, *.ngc)|*.gcode;*.GCODE;*.gco;*.GCO;*.g;*.G;*.ngc;*.NGC"),
+    std::make_pair("svg",   "SVG files *.svg|*.svg;*.SVG")
+};
 
+const std::string MODEL_WILDCARD{   FILE_WILDCARDS.at("known") + std::string("|") +
+                                    FILE_WILDCARDS.at("stl") + std::string("|") +
+                                    FILE_WILDCARDS.at("obj") + std::string("|") +
+                                    FILE_WILDCARDS.at("amf") + std::string("|") +
+                                    FILE_WILDCARDS.at("3mf") + std::string("|") +
+                                    FILE_WILDCARDS.at("prusa") };
 struct PresetTab {
     std::string       name;
     Tab*              panel;