More language support

src/TyroApp.cpp

@@ -31,6 +31,5 @@ bool TyroApp::OnInit()
 
 int TyroApp::OnExit()
 {
-	close(true);
-	return 1;
+	return close(true);
 }

src/definitions.h

@@ -5,6 +5,13 @@
 #ifndef DEFINITIONS_H
 #define	DEFINITIONS_H
 
+enum {
+	myFILE_MENU,
+	myEDIT_MENU,
+	myVIEW_MENU,
+	myHELP_MENU
+};
+
 // Application config
 const wxString APP_NAME = "Tyro";
 const wxString APP_VENDOR = "Aviat Ion";
@@ -17,7 +24,6 @@ const wxString TYRO_OPEN_ERROR = "Failed to open the file. Check that it exists,
 const wxString TYRO_OPEN_ERROR_CAPTION = "Open Failed";
 
 // EditPane file extension to lexer mapping
-typedef pair<string, int> StringConstMapData;
 typedef map<string, int> StringConstMap;
 
 const wxString TYRO_FILE_OPEN_WILDCARDS =

src/widgets/EditPane.cpp

@@ -10,12 +10,14 @@ EditPane::EditPane(
 	lexerMap["batch"] = wxSTC_LEX_BATCH;
 	lexerMap["caml"] = wxSTC_LEX_CAML;
 	lexerMap["cmake"] = wxSTC_LEX_CMAKE;
+	lexerMap["cobol"] = wxSTC_LEX_COBOL;
+	lexerMap["coffeescript"] = wxSTC_LEX_CPP;
 	lexerMap["cpp"] = wxSTC_LEX_CPP;
 	lexerMap["css"] = wxSTC_LEX_CSS;
 	lexerMap["js"] = wxSTC_LEX_CPP;
 	lexerMap["html"] = wxSTC_LEX_HTML;
 	lexerMap["makefile"] = wxSTC_LEX_MAKEFILE;
-	lexerMap["php"] = wxSTC_LEX_PHPSCRIPT | wxSTC_LEX_HTML;
+	lexerMap["php"] = wxSTC_LEX_PHPSCRIPT;
 	lexerMap["perl"] = wxSTC_LEX_PERL;
 	lexerMap["python"] = wxSTC_LEX_PYTHON;
 	lexerMap["shell"] = wxSTC_LEX_BASH;