Merge remote-tracking branch 'dept/windows'

Author: kpeeters

frontend/gtkmm/main.cc

@@ -8,6 +8,7 @@
 
 #ifdef _WIN32
 #include <Windows.h>
+#include <stdlib.h>
 #endif
 
 // Cadabra frontend with GTK+ interface (using gtkmm).
@@ -20,18 +21,35 @@ int main(int argc, char **argv)
 		const int status = application->run();
 		return status;
 		}
-	catch(Glib::Error& er) {
+	catch (Glib::Error& er) {
 		std::cerr << er.what() << std::endl;
 		return -1;
 		}
-	catch(std::exception& ex) {
+	catch (std::exception& ex) {
 		std::cerr << ex.what() << std::endl;
 		}
 	}
 
 #if defined(_WIN32) && defined(NDEBUG)
 int WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 	{
-	main(0, 0);
+	try {
+		auto application = Cadabra::create(__argc, __argv);
+		const int status = application->run();
+		return status;
+		}
+	catch (Glib::Error& er) {
+		Gtk::MessageDialog(er.what()).run();
+		return -1;
+		}
+	catch (std::exception& ex) {
+		Gtk::MessageDialog(ex.what()).run();
+		return -1;
+		}
+	catch (...) {
+		Gtk::MessageDialog("An unknown error occured :(").run();
+		throw;
+		}
 	}
-#endif
+#endif
+